Skip to content

Commit

Permalink
merged with develop
Browse files Browse the repository at this point in the history
  • Loading branch information
paola-p committed Dec 4, 2023
2 parents 82579ca + 921240e commit c73f77c
Show file tree
Hide file tree
Showing 140 changed files with 2,088 additions and 441 deletions.
1 change: 1 addition & 0 deletions .github/workflows/storybook-s3-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
'@bubbles-ui/calendars': patch
'@bubbles-ui/editors': patch
'@bubbles-ui/leemons': patch
'@bubbles-ui/extras': patch
'@bubbles-ui/icons': patch
---
Expand Down
36 changes: 35 additions & 1 deletion .idea/sonarlint/issuestore/index.pb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 35 additions & 1 deletion .idea/sonarlint/securityhotspotstore/index.pb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions packages/calendars/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,59 @@
# @bubbles-ui/calendars

## 1.2.46

### Patch Changes

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

## 1.2.45

### Patch Changes

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

## 1.2.44

### Patch Changes

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

## 1.2.43

### Patch Changes

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

## 1.2.42

### Patch Changes

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

## 1.2.41

### Patch Changes

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

## 1.2.40

### Patch Changes
Expand Down
10 changes: 5 additions & 5 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.40",
"version": "1.2.46",
"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,10 +59,10 @@
"rrule": "^2.6.8"
},
"peerDependencies": {
"@bubbles-ui/components": "^1.2.40",
"@bubbles-ui/icons": "^1.2.40",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"@bubbles-ui/components": "^1.2.46",
"@bubbles-ui/icons": "^1.2.46",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"webpack": "*"
},
"devDependencies": {
Expand Down
48 changes: 48 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,53 @@
# @bubbles-ui/components

## 1.2.46

### Patch Changes

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

## 1.2.45

### Patch Changes

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

## 1.2.44

### Patch Changes

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

## 1.2.43

### Patch Changes

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

## 1.2.42

### Patch Changes

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

## 1.2.41

### Patch Changes

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

## 1.2.40

### Patch Changes
Expand Down
9 changes: 4 additions & 5 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.40",
"version": "1.2.46",
"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.40",
"@bubbles-ui/icons": "^1.2.46",
"@emotion/react": "^11.10.0",
"@heroicons/react": "^1.0.5",
"@hookform/resolvers": "^3.3.2",
Expand All @@ -74,12 +74,10 @@
"@mantine/spotlight": "5.5.5",
"@nivo/bar": "^0.79.1",
"@nivo/core": "^0.79.0",
"@yaireo/tagify": "^4.9.4",
"colord": "^2.9.2",
"dayjs": "^1.10.7",
"immutability-helper": "^3.1.1",
"lodash": "^4.17.21",
"macy": "^2.5.1",
"namor": "^2.0.3",
"prop-types": "^15.7.2",
"react-beautiful-dnd": "^13.1.0",
Expand All @@ -91,10 +89,11 @@
"react-multiline-clamp": "^2.0.0",
"react-router-dom": "^5.3.0",
"react-table": "^7.7.0",
"react-table-sticky": "^1.1.3",
"react-zoom-pan-pinch": "^2.1.3",
"simplebar-react": "^2.3.6",
"swiper": "^8.1.4",
"uuid": "^8.3.2",
"html2canvas": "^1.4.1",
"zod": "^3.22.4"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/form/Button/Button.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const ButtonStyles = createStyles(
hasLeftIcon,
hasRightIcon,
isSelected,
}
},
) => {
const currentVariant = getVariant(variant, theme, color);
const buttonTheme = theme.other.button;
Expand Down Expand Up @@ -235,5 +235,5 @@ export const ButtonStyles = createStyles(
...buttonTheme.content.typo,
},
};
}
},
);
2 changes: 1 addition & 1 deletion packages/components/src/form/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export * from './InputWrapper';
export * from './InputLabel';
export * from './ActionButton';
export * from './BooleanInput';
export * from './TagifyInput';
export * from './ColorPicker';
export * from './NumberInput';
export * from './MultiSelect';
Expand All @@ -33,3 +32,4 @@ export * from './Autocomplete';
export * from './ImagePreviewInput';
export * from './SearchInput';
export * from './ScoreInput';
export * from './mixins/fieldStyles.mixins';
9 changes: 9 additions & 0 deletions packages/components/src/helpers/getUserFullName.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function getUserFullName(user) {
return (
(user.name ? user.name : '') +
(user.surnames ? ` ${user.surnames}` : '') +
(user.secondSurname ? ` ${user.secondSurname}` : '')
);
}

export { getUserFullName };
1 change: 1 addition & 0 deletions packages/components/src/helpers/index.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './stringToHslColor';
export * from './getUserFullName'
1 change: 1 addition & 0 deletions packages/components/src/hooks/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './useDebouncedCallback';
export * from './useResizeObserver';
export * from './useHTMLToCanvas';
20 changes: 20 additions & 0 deletions packages/components/src/hooks/useHTMLToCanvas.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { useEffect, useState } from 'react';
import html2canvas from 'html2canvas';

const useHTMLToCanvas = (ref) => {
const [canvasImage, setCanvasImage] = useState();
const renderCanvas = async () => {
if (ref.current) {
const canvas = await html2canvas(ref.current);
const response = canvas.toDataURL('image/png');
setCanvasImage(response);
}
};
useEffect(() => {
renderCanvas();
}, [ref.current]);
return { canvasImage };
};

export { useHTMLToCanvas };
export default useHTMLToCanvas;
2 changes: 2 additions & 0 deletions packages/components/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export {
getHtmlStyles,
getBoxShadowFromToken,
} from './theme.mixins';
export { PALETTE } from './theme.constants';
export { COLORS } from './theme.tokens';
export { colord } from 'colord';
export { Helmet } from 'react-helmet';
Expand All @@ -54,6 +55,7 @@ export * from './informative';
export * from './navigation';
export * from './typography';
export * from './feedback';
export * from './helpers';
export * from './overlay';
export * from './layout';
export * from './assets';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Highlight } from '@mantine/core';
import { Box } from '../../layout/Box';
import { Avatar } from '../Avatar';
import { getUserFullName } from '../../navigation/MainNav/helpers/getUserFullName';
import { getUserFullName } from '../../helpers/getUserFullName';
import { ChatMessageStyles } from './ChatMessage.styles';
import { CHAT_MESSAGE_DEFAULT_PROPS, CHAT_MESSAGE_PROP_TYPES } from './ChatMessage.constants';

Expand All @@ -28,7 +28,7 @@ const ChatMessage = ({
<Box className={classes.root}>
{showUser && !isOwn ? (
<Box className={classes.avatar}>
<Avatar image={user.avatar} size="sm" state={user.state} />
<Avatar image={user.avatar} size="sm" state={user.state} fullName={fullName} />
</Box>
) : null}

Expand Down
Loading

0 comments on commit c73f77c

Please sign in to comment.