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.

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

Chore/fave 34158 upgrade antd to v5 #159

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
84ea345
add audit & publish-local commands
AladdinNullptr Dec 28, 2023
c6235e5
Bump react types and add react-dom peer dependency
AladdinNullptr Dec 28, 2023
1e469ba
Bump antd to v5
AladdinNullptr Dec 28, 2023
6ab6e19
update style index and component template
AladdinNullptr Dec 28, 2023
f97be92
Update button style
AladdinNullptr Dec 29, 2023
89470ef
Update input style
AladdinNullptr Dec 29, 2023
e5ceee4
Update select style
AladdinNullptr Dec 29, 2023
0aba5a2
Update menu style
AladdinNullptr Dec 29, 2023
5544160
Remove duplicate form-item style
AladdinNullptr Dec 29, 2023
dfd95cc
Update checkbox style
AladdinNullptr Jan 3, 2024
14c4e5a
Update radio style
AladdinNullptr Jan 3, 2024
4b178df
Update form style
AladdinNullptr Jan 3, 2024
e4a749a
Update tabs style
AladdinNullptr Jan 3, 2024
1917a5e
Update breadcrumb style
AladdinNullptr Jan 3, 2024
14f926c
Update dropdown style
AladdinNullptr Jan 11, 2024
64682fc
Update base style
AladdinNullptr Jan 11, 2024
b71bdcf
Update modal style
AladdinNullptr Jan 11, 2024
5023063
Update mentions style
AladdinNullptr Jan 11, 2024
e1ad8cd
Update steps style
AladdinNullptr Jan 11, 2024
e14877f
Update pagination style
AladdinNullptr Jan 11, 2024
754f598
Update date picker style
AladdinNullptr Jan 11, 2024
ee14a1f
Update message component type
AladdinNullptr Jan 11, 2024
18a1780
Update notification component type
AladdinNullptr Jan 11, 2024
d676b46
Update Comment and PageHeader imports and deprecation messages
AladdinNullptr Jan 11, 2024
d43ac06
Update popover style
AladdinNullptr Jan 11, 2024
3c5cac3
Update List and layout stories
AladdinNullptr Jan 11, 2024
ee30633
Update tag component
AladdinNullptr Jan 11, 2024
92900bf
Update progress style
AladdinNullptr Jan 11, 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
Prev Previous commit
Next Next commit
Update select style
  • Loading branch information
AladdinNullptr committed Dec 29, 2023
commit e5ceee463f6f6a275a56833e7777d4a9b235d0b8
8 changes: 5 additions & 3 deletions src/Select/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import { CaretDown, Check } from 'phosphor-react'

import './style.css'

export type SelectProps = AntSelectProps
export type SelectProps = AntSelectProps & {
showArrow?: boolean
}

export const { Option } = AntSelect

const Select: React.FC<SelectProps> = props => {
return <AntSelect {...props} />
const Select: React.FC<SelectProps> = ({ suffixIcon, showArrow, ...rest }) => {
return <AntSelect {...rest} suffixIcon={showArrow ? suffixIcon : null} />
}

export const CheckeableItem: React.FC<React.PropsWithChildren<{}>> = ({ children }) => (
Expand Down
10 changes: 4 additions & 6 deletions src/Select/style.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/* @import '../Empty/style.css'; */

.ant-select {
@apply font-inter bg-white rounded-lg flex;

&-single:not(.ant-select-customize-input) {
.ant-select-selector {
@apply px-3 rounded-lg h-10;
@apply px-3 rounded-lg;

.ant-select-selection-item {
@apply m-auto;
Expand Down Expand Up @@ -115,15 +113,15 @@
}
}

&-item-option-active:not(.ant-select-item-option-disabled) {
& &-item-option-active:not(.ant-select-item-option-disabled) {
@apply mx-2 bg-neutral-100 rounded;
}

&-item {
& &-item {
@apply mx-2 h-9;
}

&-arrow {
& &-arrow {
@apply w-4 h-4 text-neutral-500;
}
}
Expand Down