Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/leemonade/bubbles into d…
Browse files Browse the repository at this point in the history
…evelop

* 'develop' of https://github.com/leemonade/bubbles:
  chore: version bump
  fix(FileUpload): stop disabled component to keep working
  • Loading branch information
johan-fx committed Jan 19, 2024
2 parents f3ac6be + 941df6b commit 3e32ac2
Show file tree
Hide file tree
Showing 15 changed files with 97 additions and 30 deletions.
9 changes: 9 additions & 0 deletions packages/calendars/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @bubbles-ui/calendars

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.127
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/calendars/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/calendars",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -59,8 +59,8 @@
"rrule": "^2.6.8"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.126",
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/components": "^1.2.127",
"@bubbles-ui/icons": "^1.2.127",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
8 changes: 8 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @bubbles-ui/components

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/components",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -61,7 +61,7 @@
"chromatic": "npx chromatic --project-token=7b10302a7b6b --build-script-name=build:storybook:raw"
},
"dependencies": {
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/icons": "^1.2.127",
"@emotion/react": "^11.10.0",
"@heroicons/react": "^1.0.5",
"@hookform/resolvers": "^3.3.2",
Expand Down
26 changes: 16 additions & 10 deletions packages/components/src/form/FileUpload/FileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ const FileUpload = ({
{...props}
accept={accept}
loading={loading}
disabled={disabled || loading}
multiple={multipleUpload}
onDrop={onDropHandler}
classNames={classes}
Expand Down Expand Up @@ -206,22 +207,27 @@ const FileUpload = ({
</Box>
)}
</Stack>
<Box noFlex>
<Button
onClick={() => removeFile(index)}
variant="link"
leftIcon={<DeleteBinIcon height={16} width={16} />}
>
Borrar
</Button>
</Box>
{!disabled && (
<Box noFlex>
<Button
disabled={disabled}
onClick={() => removeFile(index)}
variant="link"
leftIcon={<DeleteBinIcon height={16} width={16} />}
>
Borrar
</Button>
</Box>
)}
</Stack>
))}
</Stack>
)}
{!hideUploadButton && (
<Box className={classes.uploadButton}>
<Button onClick={() => openRef.current()}>Upload</Button>
<Button onClick={() => openRef.current()} disabled={disabled || loading}>
Upload
</Button>
</Box>
)}
</Box>
Expand Down
9 changes: 9 additions & 0 deletions packages/editors/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @bubbles-ui/editors

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.127
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/editors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/editors",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -79,8 +79,8 @@
"styled-icons": "^10.45.0"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.126",
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/components": "^1.2.127",
"@bubbles-ui/icons": "^1.2.127",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
9 changes: 9 additions & 0 deletions packages/extras/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @bubbles-ui/extras

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.127
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/extras/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/extras",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -53,8 +53,8 @@
"swiper": "^8.1.4"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.126",
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/components": "^1.2.127",
"@bubbles-ui/icons": "^1.2.127",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down
6 changes: 6 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @bubbles-ui/icons

## 1.2.127

### Patch Changes

- Versions bump

## 1.2.126

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/icons",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System icons library.",
"license": "MIT",
"repository": {
Expand Down
11 changes: 11 additions & 0 deletions packages/leemons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @bubbles-ui/leemons

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.127
- @bubbles-ui/calendars@1.2.127
- @bubbles-ui/editors@1.2.127
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions packages/leemons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/leemons",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -74,10 +74,10 @@
"ajv": "6.12.6"
},
"peerDependencies": {
"@bubbles-ui/calendars": "^1.2.126",
"@bubbles-ui/components": "^1.2.126",
"@bubbles-ui/editors": "^1.2.126",
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/calendars": "^1.2.127",
"@bubbles-ui/components": "^1.2.127",
"@bubbles-ui/editors": "^1.2.127",
"@bubbles-ui/icons": "^1.2.127",
"dayjs": "^1.10.7",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand Down
9 changes: 9 additions & 0 deletions packages/notifications/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @bubbles-ui/notifications

## 1.2.127

### Patch Changes

- Versions bump
- Updated dependencies
- @bubbles-ui/components@1.2.127
- @bubbles-ui/icons@1.2.127

## 1.2.126

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/notifications/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bubbles-ui/notifications",
"version": "1.2.126",
"version": "1.2.127",
"description": "The Bubbles Design System is Leemonade's open-source design system for products and experiences.",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -52,8 +52,8 @@
"react-transition-group": "^4.4.2"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.126",
"@bubbles-ui/icons": "^1.2.126",
"@bubbles-ui/components": "^1.2.127",
"@bubbles-ui/icons": "^1.2.127",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down

0 comments on commit 3e32ac2

Please sign in to comment.