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: card component flex issue - Ds 849 #3817

Merged
merged 11 commits into from
May 24, 2024
+12 −103
Merged

fix: card component flex issue - Ds 849 #3817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f62161b
fix: adjust the estimated cost condition to control the visibility of…
Lawndlwd Jan 2, 2024
810ca60
fix: card component flex issue
Lawndlwd May 24, 2024
0b4affb
fix: card component flex issue
Lawndlwd May 24, 2024
e712931
fix: card component flex issue
Lawndlwd May 24, 2024
d31ae9c
fix: card component flex issue
Lawndlwd May 24, 2024
0e40059
fix: card component flex issue
Lawndlwd May 24, 2024
65a5c0d
fix: card component flex issue
Lawndlwd May 24, 2024
26cfe2d
fix: card component flex issue
Lawndlwd May 24, 2024
18198eb
test(snapshots): update snap
philibea May 24, 2024
352f338
fix: card component flex issue
Lawndlwd May 24, 2024
92d2608
test(snapshots): update snap
philibea May 24, 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: 5 additions & 0 deletions .changeset/clean-eagles-clean.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ultraviolet/ui": patch
---

Fix Card component style by removing flex
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dist/
coverage
storybook-static
.reports

.pnpm-store

# VSCode extension "Local History"
.history
Expand Down
28 changes: 0 additions & 28 deletions packages/plus/src/components/FAQ/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ exports[`FAQ > should work with default props 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 16px;
text-align: left;
}
Expand Down Expand Up @@ -106,13 +99,6 @@ exports[`FAQ > should work with illustration 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 16px;
text-align: left;
}
Expand Down Expand Up @@ -278,13 +264,6 @@ exports[`FAQ > should work with illustrationTest 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 16px;
text-align: left;
}
Expand Down Expand Up @@ -406,13 +385,6 @@ exports[`FAQ > should work with notes 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 16px;
text-align: left;
}
Expand Down
14 changes: 0 additions & 14 deletions packages/plus/src/components/SteppedListCard/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,6 @@ exports[`SteppedListCard > should work with custom hide action 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 0;
}

Expand Down Expand Up @@ -551,13 +544,6 @@ exports[`SteppedListCard > should work with default props 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
padding: 0;
}

Expand Down
56 changes: 0 additions & 56 deletions packages/ui/src/components/Card/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ exports[`Card > renders correctly with advanced header 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-2[data-is-active='true'] {
Expand Down Expand Up @@ -78,13 +71,6 @@ exports[`Card > renders correctly with className 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-0[data-is-active='true'] {
Expand Down Expand Up @@ -115,13 +101,6 @@ exports[`Card > renders correctly with data-testid 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-0[data-is-active='true'] {
Expand Down Expand Up @@ -153,13 +132,6 @@ exports[`Card > renders correctly with disabled 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-0[data-is-active='true'] {
Expand Down Expand Up @@ -228,13 +200,6 @@ exports[`Card > renders correctly with disabled and header 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-4[data-is-active='true'] {
Expand Down Expand Up @@ -313,13 +278,6 @@ exports[`Card > renders correctly with header 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-4[data-is-active='true'] {
Expand Down Expand Up @@ -360,13 +318,6 @@ exports[`Card > renders correctly with isActive 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-0[data-is-active='true'] {
Expand Down Expand Up @@ -397,13 +348,6 @@ exports[`Card > renders correctly without header 1`] = `
border: 1px solid #d9dadd;
border-radius: 4px;
padding: 24px;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.emotion-0[data-is-active='true'] {
Expand Down
2 changes: 0 additions & 2 deletions packages/ui/src/components/Card/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ const BorderedBox = styled.div`
border: 1px solid ${({ theme }) => theme.colors.neutral.border};
border-radius: ${({ theme }) => theme.radii.default};
padding: ${({ theme }) => theme.space['3']};
flex: 1;
display: flex;

&[data-is-active='true'] {
border: 1px solid ${({ theme }) => theme.colors.primary.border};
Expand Down
8 changes: 6 additions & 2 deletions packages/ui/src/components/SelectInputV2/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event'
import { renderWithTheme } from '@utils/test'
import type { ReactNode } from 'react'
import { act } from 'react'
import { beforeAll, describe, expect, test, vi } from 'vitest'
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
import { SelectInputV2 } from '..'
import { OptionalInfo, cities, dataGrouped, dataUnGrouped } from './resources'

Expand All @@ -16,13 +16,17 @@ export type OptionType = {
}

describe('SelectInputV2', () => {
beforeAll(() => {
beforeEach(() => {
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
configurable: true,
value: 500,
})
})

afterEach(() => {
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {})
})

test('renders correctly', () => {
const { asFragment } = renderWithTheme(
<SelectInputV2 name="test" options={dataUnGrouped} label="label" />,
Expand Down
Loading