diff --git a/src/internal/Actions/ActionButton.module.css b/src/internal/Actions/ActionButton.module.css index 44272b1..4b4bdd3 100644 --- a/src/internal/Actions/ActionButton.module.css +++ b/src/internal/Actions/ActionButton.module.css @@ -1,3 +1,5 @@ +@import url("@/lib/Layout/customMedia.css"); + .row { display: flex; flex-direction: column; diff --git a/src/internal/Actions/Actions.module.css b/src/internal/Actions/Actions.module.css index 7e38678..a8945af 100644 --- a/src/internal/Actions/Actions.module.css +++ b/src/internal/Actions/Actions.module.css @@ -6,11 +6,15 @@ max-width: 240px; & .action-row { - &:first-of-type { - & .primary-action, - & .inverted-action { + & .primary-action, + & .inverted-action { + &:first-of-type { border-top: none; } + + &:not(:only-child, :last-child) { + border-right: var(--fg-border-width-100) solid var(--fg-background-100); + } } } } diff --git a/src/internal/Actions/mockActions.ts b/src/internal/Actions/mockActions.ts index ad316ed..4c26428 100644 --- a/src/internal/Actions/mockActions.ts +++ b/src/internal/Actions/mockActions.ts @@ -2,7 +2,8 @@ import {fn} from '@storybook/test'; import {CloudUpload, IconFile} from '@/internal/Icons'; -import type {Props as ActionProps} from '@/internal/Actions/ActionButton.tsx'; + +import type {Props as ActionProps} from './ActionButton.tsx'; export const actionsMockMultiple = [ {title: 'Default Action', onClick: fn()}, diff --git a/src/lib/Card/Card.tsx b/src/lib/Card/Card.tsx index c7ddf67..b7a751b 100644 --- a/src/lib/Card/Card.tsx +++ b/src/lib/Card/Card.tsx @@ -7,7 +7,8 @@ import type {DataAttributes, LibraryProps} from '@/internal/LibraryAPI'; import {useInternalId} from '@/internal/hooks/useInternalId.ts'; import {useLinkRefs} from '@/internal/hooks/useLinkRefs.ts'; import {Picture} from '@/lib'; -import {ActionButton} from '@/internal/Actions'; +import type {ActionButton} from '@/internal/Actions'; +import {ActionsTree} from '@/internal/Actions'; import classes from './Card.module.css'; @@ -72,26 +73,11 @@ export const Card = forwardRef( {headerImageUrl && }
{children}
- {actions.map((actionSlot, i) => { - if (Array.isArray(actionSlot)) { - const [left, right] = actionSlot; - return ( -
- - -
- ); - } else { - return ( -
- -
- ); - } - })} +
); diff --git a/src/lib/Dialog/Dialog.module.css b/src/lib/Dialog/Dialog.module.css index b6cb9e0..21e4a04 100644 --- a/src/lib/Dialog/Dialog.module.css +++ b/src/lib/Dialog/Dialog.module.css @@ -61,8 +61,4 @@ display: flex; flex-direction: column; width: 100%; - - @media (--viewport-md) { - flex-direction: row; - } } diff --git a/src/lib/Dialog/Dialog.tsx b/src/lib/Dialog/Dialog.tsx index 8082b97..a4f0e75 100644 --- a/src/lib/Dialog/Dialog.tsx +++ b/src/lib/Dialog/Dialog.tsx @@ -7,7 +7,7 @@ import {useInternalRef} from '@/internal/hooks/useInternalRef.ts'; import {IconClose} from '@/internal/Icons'; import {H3} from '@/lib'; import {useFocusTrap} from '@/internal/hooks/useFocusTrap.ts'; -import {ActionButton} from '@/internal/Actions'; +import {ActionButton, ActionsTree} from '@/internal/Actions'; import {TransitionDialog} from './TransitionDialog.tsx'; import {useDialogState} from './useDialogState.tsx'; @@ -115,23 +115,7 @@ export const Dialog = forwardRef( )}
{children}