Skip to content

Commit

Permalink
fix: the form corner default and separate the gap from the flex class…
Browse files Browse the repository at this point in the history
…Name
  • Loading branch information
HamzaAmar committed Oct 23, 2023
1 parent 88b7989 commit df335a2
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 11 deletions.
3 changes: 3 additions & 0 deletions packages/pillar-core/src/core/flex/_flex.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.flex {
display: flex;
}

.flex--gap {
gap: var(--spacing);
}
1 change: 1 addition & 0 deletions packages/pillar-core/src/core/flex/flex.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const Flex = forwardRef((props, forwardedRef) => {
'l_flex-wrap': !!wrap,
'u_flex-inline': !!inline,
[`u_spacing-${gap}`]: !!gap,
[`flex--gap`]: !!gap,
[`${className}`!]: !!className,
})

Expand Down
14 changes: 7 additions & 7 deletions packages/pillar-core/src/core/form/formField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>((props, forwardedR
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -147,7 +147,7 @@ export const InputNumber = forwardRef<HTMLInputElement, InputProps>((props, forw
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -231,7 +231,7 @@ export const InputPassword = forwardRef<HTMLInputElement, InputPasswordProps>((p
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -292,7 +292,7 @@ export const InputSearch = forwardRef<HTMLInputElement, InputProps>((props, forw
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -343,7 +343,7 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>((props, forward
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -394,7 +394,7 @@ export const PinInput = forwardRef<HTMLInputElement, PinInputProps>((props, forw
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down Expand Up @@ -482,7 +482,7 @@ export const InputFile = forwardRef<HTMLInputElement, InputProps>((props, forwar
const {
size = formGroupContext?.size ?? 'md',
variant = formGroupContext?.variant ?? 'outline',
corner = formGroupContext?.corner ?? 'sm',
corner = formGroupContext?.corner,
color = formGroupContext?.color ?? 'primary',
transform,
fluid = formGroupContext?.fluid,
Expand Down
30 changes: 26 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3927,7 +3927,7 @@
dependencies:
"@opentelemetry/api" "^1.0.0"

"@opentelemetry/api@1.4.1", "@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.4.1":
"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.4.1":
version "1.4.1"
resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
integrity sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==
Expand All @@ -3944,7 +3944,7 @@
dependencies:
"@opentelemetry/semantic-conventions" "1.13.0"

"@opentelemetry/exporter-trace-otlp-grpc@0.39.1", "@opentelemetry/exporter-trace-otlp-grpc@^0.39.1":
"@opentelemetry/exporter-trace-otlp-grpc@^0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.39.1.tgz#3949f909fb3f8cbb456480a35829bb2630331bd3"
integrity sha512-l5RhLKx6U+yuLhMrtgavTDthX50E1mZM3/SSySC7OPZiArFHV/b/9x9jxAzrOgIQUDxyj4N0V9aLKSA2t7Qzxg==
Expand Down Expand Up @@ -4033,7 +4033,7 @@
"@opentelemetry/resources" "1.13.0"
"@opentelemetry/semantic-conventions" "1.13.0"

"@opentelemetry/sdk-trace-node@1.13.0", "@opentelemetry/sdk-trace-node@^1.13.0":
"@opentelemetry/sdk-trace-node@^1.13.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.13.0.tgz#baadf62218ca69e37486debfbcf15b2563f75979"
integrity sha512-FXA85lXKTsnbOflA/TBuBf2pmhD3c8uDjNjG0YqK+ap8UayfALmfJhf+aG1yBOUHevCY0JXJ4/xtbXExxpsMog==
Expand Down Expand Up @@ -10534,6 +10534,17 @@ fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9:
merge2 "^1.3.0"
micromatch "^4.0.4"

fast-glob@^3.3.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
glob-parent "^5.1.2"
merge2 "^1.3.0"
micromatch "^4.0.4"

fast-json-parse@^1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"
Expand Down Expand Up @@ -11309,6 +11320,17 @@ globby@^13.0.0, globby@^13.1.2:
merge2 "^1.4.1"
slash "^4.0.0"

globby@^13.2.2:
version "13.2.2"
resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
dependencies:
dir-glob "^3.0.1"
fast-glob "^3.3.0"
ignore "^5.2.4"
merge2 "^1.4.1"
slash "^4.0.0"

globby@^9.2.0:
version "9.2.0"
resolved "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz"
Expand Down Expand Up @@ -12028,7 +12050,7 @@ ignore@^4.0.3, ignore@^4.0.6:
resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==

ignore@^5.0.0, ignore@^5.2.0:
ignore@^5.0.0, ignore@^5.2.0, ignore@^5.2.4:
version "5.2.4"
resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
Expand Down

0 comments on commit df335a2

Please sign in to comment.