Skip to content

Commit

Permalink
Merge branch 'develop' into epic/Assigns-6
Browse files Browse the repository at this point in the history
  • Loading branch information
fermarinsanchez committed Dec 15, 2023
2 parents d09113e + fa1fe89 commit b0eb729
Show file tree
Hide file tree
Showing 20 changed files with 161 additions and 43 deletions.
18 changes: 18 additions & 0 deletions packages/calendars/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/calendars

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/icons": "^1.2.52",
"@bubbles-ui/components": "^1.2.54",
"@bubbles-ui/icons": "^1.2.54",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
16 changes: 16 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# @bubbles-ui/components

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/icons": "^1.2.54",
"@emotion/react": "^11.10.0",
"@heroicons/react": "^1.0.5",
"@hookform/resolvers": "^3.3.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/components/src/layout/TotalLayout/TotalLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const TotalLayout = ({
}) => {
const form = useFormContext();
const [topScroll, setTopScroll] = React.useState(false);
const [showFooterShadow, setShowFooterShadow] = React.useState(false);
const [showFooterBorder, setShowFooterBorder] = React.useState(false);
const [lastValidStep, setLastValidStep] = React.useState(false);

const footerLeftOffset = showStepper && 192 + 16; // Stepper plus margin (16) : margin
Expand Down Expand Up @@ -78,9 +78,9 @@ const TotalLayout = ({

const atTheBottom = scrollHeight - scrollTop === clientHeight;
const isScrollable = scrollHeight > clientHeight;
if (isScrollable && !atTheBottom && !showFooterShadow) setShowFooterShadow(true);
else if ((!isScrollable && showFooterShadow) || (atTheBottom && showFooterShadow))
setShowFooterShadow(false);
if (isScrollable && !atTheBottom && !showFooterBorder) setShowFooterBorder(true);
else if ((!isScrollable && showFooterBorder) || (atTheBottom && showFooterBorder))
setShowFooterBorder(false);
}
};
React.useEffect(() => {
Expand Down Expand Up @@ -175,7 +175,7 @@ const TotalLayout = ({
<Footer
leftOffset={footerLeftOffset}
activeStep={activeStep}
showFooterShadow={showFooterShadow}
showFooterBorder={showFooterBorder}
onBack={handlePrev}
onNext={() => validateAndAct(handleNext)}
finalActions={finalActions}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,6 @@ const Template = () => {
console.log('Form values to SAVE as draft', formValues);
};

const handleOnSave = () => {
setModalContent({
title: 'Guardar Borrador',
body: 'Guardando Borrador',
action: saveDraft,
});
setOpenModal(true);
};

const handlePublish = async () => {
console.log('Form values to PUBLISH:', formValues);
};
Expand Down Expand Up @@ -187,7 +178,7 @@ const Template = () => {
footerActionsLabels={footerActionsLabels}
footerFinalActions={footerFinalActions}
minStepNumberForDraftSave={1}
onSave={handleOnSave}
onSave={saveDraft}
initialStepsInfo={initialStepsInfo}
onCancel={onCancel}
isLoading={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { TOTAL_LAYOUT_FOOTER_PROP_TYPES } from './TotalLayout.constants';
const TotalLayoutFooter = ({
leftOffset,
activeStep,
showFooterShadow,
showFooterBorder,
onBack,
onNext,
finalActions,
Expand All @@ -20,7 +20,7 @@ const TotalLayoutFooter = ({
isLoading,
}) => {
const { classes } = TotalLayoutFooterStyles(
{ showFooterShadow, leftOffset },
{ showFooterBorder, leftOffset },
{ name: 'TotalLayoutFooter' },
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export const TOTAL_LAYOUT_HEADER_PROP_TYPES = {
};

export const TOTAL_LAYOUT_HEADER_DEFAULT_PROPS = {
title: 'Title',
title: '',
icon: <Icon />,
formTitlePlaceholder: 'User input placeholder',
formTitlePlaceholder: '',
compact: false,
};
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react';
import { Text } from '../../../typography';
import { Stack } from '../../Stack';
import {
Expand Down
18 changes: 18 additions & 0 deletions packages/editors/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/editors

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/icons": "^1.2.52",
"@bubbles-ui/components": "^1.2.54",
"@bubbles-ui/icons": "^1.2.54",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
Expand Down
18 changes: 18 additions & 0 deletions packages/extras/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/extras

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/icons": "^1.2.52",
"@bubbles-ui/components": "^1.2.54",
"@bubbles-ui/icons": "^1.2.54",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down
12 changes: 12 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @bubbles-ui/icons

## 1.2.54

### Patch Changes

- Versions bump

## 1.2.53

### Patch Changes

- Versions bump

## 1.2.52

### 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.52",
"version": "1.2.54",
"description": "The Bubbles Design System icons library.",
"license": "MIT",
"repository": {
Expand Down
22 changes: 22 additions & 0 deletions packages/leemons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# @bubbles-ui/leemons

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/components": "^1.2.52",
"@bubbles-ui/editors": "^1.2.52",
"@bubbles-ui/icons": "^1.2.52",
"@bubbles-ui/calendars": "^1.2.54",
"@bubbles-ui/components": "^1.2.54",
"@bubbles-ui/editors": "^1.2.54",
"@bubbles-ui/icons": "^1.2.54",
"dayjs": "^1.10.7",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand Down
18 changes: 18 additions & 0 deletions packages/notifications/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @bubbles-ui/notifications

## 1.2.54

### Patch Changes

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

## 1.2.53

### Patch Changes

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

## 1.2.52

### 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.52",
"version": "1.2.54",
"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.52",
"@bubbles-ui/icons": "^1.2.52",
"@bubbles-ui/components": "^1.2.54",
"@bubbles-ui/icons": "^1.2.54",
"@mantine/core": "5.2.4",
"@mantine/hooks": "5.2.4",
"react": "^17.0.1",
Expand Down
Loading

0 comments on commit b0eb729

Please sign in to comment.