Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add danger theme color to icon-only buttons & allow color styling of TableRowActions #2661

Closed
wants to merge 1 commit into from
+47 −26
Closed

Add danger theme color to icon-only buttons & allow color styling of TableRowActions #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 27 additions & 18 deletions stencil-workspace/src/components/modus-button/modus-button.vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Default theme colors
$btn-theme-colors: (
'primary': #0063a3,
'primary': $col_blue,
'secondary': #6a6e79,
'tertiary': #cbcdd6,
'danger': #da212c,
'tertiary': $col_gray_1,
'danger': $col_red,
);
$btn-hover-colors: (
'primary': #0082d6,
Expand All @@ -20,7 +20,7 @@ $btn-active-colors: (

// Default Outline
$btn-outline-theme-colors: (
'primary': #0063a3,
'primary': $col_blue,
'secondary': $col_trimble_gray,
);
$btn-outline-hover: (
Expand All @@ -46,7 +46,7 @@ $btn-outline-active: (

// Default Borderless
$modus-btn-borderless-bg: var(--modus-btn-text-primary-bg, transparent) !default;
$modus-btn-borderless-color: var(--modus-btn-text-primary-color, #0063a3) !default;
$modus-btn-borderless-color: var(--modus-btn-text-primary-color, $col_blue) !default;
$modus-btn-borderless-secondary-color: var(--modus-btn-borderless-secondary-color, #000) !default;

// Hover
Expand Down Expand Up @@ -88,35 +88,44 @@ $modus-btn-disabled-border-color: var(--modus-btn-disabled-border-color) !defaul

// Default Icon-only
$btn-icon-only-theme-colors: (
'primary': #0063a3,
'primary': $col_blue,
'secondary': $col_trimble_gray,
'tertiary': $col_gray_6,
'danger': $col_red,
);
$btn-icon-only-hover: (
'primary': (
'bg': #dcedf9,
'color': $col_blue_light,
),
'secondary': (
'bg': #e0e1e9,
'bg': $col_gray_0,
'color': $col_gray_6,
),
'tertiary': (
'bg': #e0e1e9,
'bg': $col_gray_0,
'color': $col_trimble_gray,
),
'primary': (
'bg': #dcedf9,
'color': #217cbb,
'danger': (
'bg': $col_gray_0,
'color': $col_red,
),
);
$btn-icon-only-active: (
'tertiary': (
'bg': #cbcdd6,
'color': $col_trimble_gray,
'primary': (
'bg': rgba(0, 99, 163, 0.18),
'color': #004f83,
),
'secondary': (
'bg': #cbcdd6,
'bg': $col_gray_1,
'color': $col_trimble_gray,
),
'primary': (
'bg': rgba(0, 99, 163, 0.18),
'color': #004f83,
'tertiary': (
'bg': $col_gray_1,
'color': $col_trimble_gray,
),
'danger': (
'bg': $col_gray_1,
'color': $col_red,
),
);
10 changes: 5 additions & 5 deletions stencil-workspace/src/components/modus-icons/readme.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions stencil-workspace/src/components/modus-table/models/modus-table.models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
VisibilityState,
} from '@tanstack/table-core';
import { BadgeProperties } from '../../modus-badge/modus-badge';
import { ButtonColor } from '../../modus-button/modus-button.models';
import {
COLUMN_DEF_DATATYPE_INTEGER,
COLUMN_DEF_DATATYPE_LINK,
Expand Down Expand Up @@ -65,6 +66,7 @@ export type ModusTableSortingFunction<TData extends RowData> = SortingFnOption<T
export interface ModusTableRowAction {
id: string;
icon?: string;
iconColor?: ButtonColor;
label?: string;
index: number;
isDisabled?: (row: unknown) => boolean;
Expand Down
4 changes: 2 additions & 2 deletions ...ponents/modus-table/parts/row/actions/modus-table-row-actions/modus-table-row-actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ export class ModusTableRowActions {
}
return (
<Host>
{actionButtons?.map(({ label, icon, id, isDisabled = () => false }) => {
{actionButtons?.map(({ label, icon, iconColor, id, isDisabled = () => false }) => {
const disabled = isDisabled(this.row.original);
return (
<modus-button
class="row-actions"
button-style="borderless"
color="secondary"
color={iconColor || 'secondary'}
icon-only={icon}
size="small"
ariaLabel={label}
Expand Down
7 changes: 7 additions & 0 deletions stencil-workspace/src/global/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@
--modus-btn-icon-only-tertiary-active-bg: var(--modus-gray-1);
--modus-btn-icon-only-tertiary-active-color: var(--modus-trimble-gray);

// Danger
--modus-btn-icon-only-danger-color: var(--modus-danger);
--modus-btn-icon-only-danger-hover-bg: var(--modus-gray-0);
--modus-btn-icon-only-danger-hover-color: var(--modus-danger);
--modus-btn-icon-only-danger-active-bg: var(--modus-gray-1);
--modus-btn-icon-only-danger-active-color: var(--modus-red-dark);

// Icon
--modus-icon-colour: var(--modus-gray-10);

Expand Down
1 change: 1 addition & 0 deletions ...rkspace/storybook/stories/components/modus-table/modus-table-storybook-docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ interface ModusTableRowSelectionOptions {
interface ModusTableRowAction {
id: string;
icon?: string;
iconColor?: ButtonColor;
label?: string;
index: number;
isDisabled?: (row: unknown) => boolean;
Expand Down
4 changes: 3 additions & 1 deletion stencil-workspace/storybook/stories/components/modus-table/modus-table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,7 @@ RowActions.args = {
{
id: '1',
icon: 'add',
iconColor: 'primary',
label: 'Add',
index: 0,
},
Expand All @@ -981,7 +982,8 @@ RowActions.args = {

{
id: '3',
icon: 'cancel',
icon: 'cancel_circle',
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is the bug referenced in the PR body. There is no cancel icon. I chose to substutite cancel_circle, but there is also cancel_square if that's desired.

iconColor: 'danger',
label: 'Cancel',
index: 2,
},
Expand Down