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

fix(table): [SIDE-637] do not push info button to next column #394

Merged
merged 2 commits into from
Sep 20, 2024
Merged

fix(table): [SIDE-637] do not push info button to next column #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c4afa2
fix(table): [SIDE-637] do not push info button to next column
talo242 Sep 20, 2024
c5e4639
refactor(table): make column narrow only if modalContent exists
talo242 Sep 20, 2024
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
5 changes: 4 additions & 1 deletion src/lib/components/table/Table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ const initialData: TableData = [
],
[
{ text: 'Operations', modalContent: 'info' },
{ checkmarkValue: true, modalContent: 'Maybe' },
{
text: 'This is a table cell with a lot of text',
modalContent: 'Maybe',
},
{ checkmarkValue: false },
{ checkmarkValue: true },
],
Expand Down
6 changes: 6 additions & 0 deletions src/lib/components/table/components/TableCell/BaseCell/BaseCell.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
position: relative;
}

.maxWidth {
@include p-size-mobile {
max-width: calc(100% - 64px);
}
}

.infoButtonAbsolute {
position: absolute;
right: -32px;
Expand Down
7 changes: 5 additions & 2 deletions src/lib/components/table/components/TableCell/BaseCell/BaseCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import classNames from 'classnames';
import {
CheckIcon,
XIcon,
StarFilledIcon,
XIcon,
ZapFilledIcon,
} from '../../../../icon';
import { ReactNode } from 'react';
Expand Down Expand Up @@ -70,6 +70,8 @@ export const BaseCell = ({
? progressLookup[text]
: undefined;

console.log(modalContent);

return (
<div
className={classNames('d-flex gap8 ai-center', {
Expand All @@ -80,7 +82,8 @@ export const BaseCell = ({
className={classNames(
'd-flex fd-column',
alignClassName,
styles.relative
styles.relative,
{ [styles.maxWidth]: modalContent && align === 'center' }
)}
>
{progressBarValue !== undefined && (
Expand Down
Loading