From 35fef1e7656d5e9d12c33eac98f563b19b899414 Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Mon, 28 Aug 2023 17:15:19 -0300 Subject: [PATCH 1/6] =?UTF-8?q?[TS-950]=20[TS-1582]=20-=20Ajustar=20a=20pr?= =?UTF-8?q?=C3=A9-visualiza=C3=A7ao=20de=20mensagem=20para=20contemplar=20?= =?UTF-8?q?n=C3=B3s=20cuja=20op=C3=A7=C3=A3o=20de=20resposta=20seja=20list?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/MessagePreview/MessagePreview.js | 9 +++++++++ .../MessagePreview/components/ListItens.js | 13 +++++++++++++ .../ui-kit/src/components/MessagePreview/styles.js | 3 +++ .../stories/MessagePreview/MessagePreview.story.tsx | 10 +++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/ui-kit/src/components/MessagePreview/components/ListItens.js diff --git a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js index d7863f0a..bb46d5a2 100644 --- a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js +++ b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js @@ -7,12 +7,15 @@ import { cardStyle } from './styles'; import { MessagePreviewUtils } from './utils'; import { MessageButtons } from './components/MessageButtons'; import { PreviewHeader } from './components/PreviewHeader'; +import { ListItens } from './components/ListItens'; +import Divider from '../Divider'; const useStyles = makeStyles(cardStyle); export const MessagePreview = ({ unformattedText, buttons, + sections, media, header, footer, @@ -54,6 +57,12 @@ export const MessagePreview = ({ {footer &&
{footer}
}
{currentTime()}
+ {sections?.length > 0 && buttons?.length === 0 && ( + + + + + )} {buttons?.length > 0 && ( diff --git a/packages/ui-kit/src/components/MessagePreview/components/ListItens.js b/packages/ui-kit/src/components/MessagePreview/components/ListItens.js new file mode 100644 index 00000000..6eed1a78 --- /dev/null +++ b/packages/ui-kit/src/components/MessagePreview/components/ListItens.js @@ -0,0 +1,13 @@ +import React from 'react'; +import { Grid, Typography } from '@material-ui/core'; +import { mdiFormatListBulletedSquare } from '@mdi/js'; +import Icon from '@mdi/react'; + +export const ListItens = ({ sections, classes }) => ( + +
+ + Ver Opções +
+ +); diff --git a/packages/ui-kit/src/components/MessagePreview/styles.js b/packages/ui-kit/src/components/MessagePreview/styles.js index 9cb1e850..6245123c 100644 --- a/packages/ui-kit/src/components/MessagePreview/styles.js +++ b/packages/ui-kit/src/components/MessagePreview/styles.js @@ -84,6 +84,9 @@ export const cardStyle = () => ({ order: 1, alignSelf: 'stretch', }, + listButton: { + width: '100%', + }, textTime: { marginBottom: '-5px', fontSize: '9px', diff --git a/packages/ui-kit/stories/MessagePreview/MessagePreview.story.tsx b/packages/ui-kit/stories/MessagePreview/MessagePreview.story.tsx index 44b0202e..508c7315 100644 --- a/packages/ui-kit/stories/MessagePreview/MessagePreview.story.tsx +++ b/packages/ui-kit/stories/MessagePreview/MessagePreview.story.tsx @@ -31,7 +31,7 @@ export default { }; export const Base = args => { - const { unformattedText, buttons, media, header, footer } = args; + const { unformattedText, buttons, sections, media, header, footer } = args; return ( @@ -47,6 +47,7 @@ export const Base = args => { unformattedText={unformattedText} buttons={buttons} media={media} + sections={sections} header={header} footer={footer} /> @@ -75,6 +76,13 @@ Base.args = { description: 'Encerrar', }, ], + sections: [ + { + position: 1, + title: 'Título do item na lista', + description: 'Descrição do item da lista', + } + ], media: 'https://cdn.portaltecsinapse.com.br/src/chat-component/template-image-example.jpg', header: undefined, From 1c5cf187561f6d2d7897c144c37282ccae04b92c Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Mon, 28 Aug 2023 17:35:48 -0300 Subject: [PATCH 2/6] =?UTF-8?q?[TS-950]=20[TS-1582]=20-=20Ajustar=20a=20pr?= =?UTF-8?q?=C3=A9-visualiza=C3=A7ao=20de=20mensagem=20para=20contemplar=20?= =?UTF-8?q?n=C3=B3s=20cuja=20op=C3=A7=C3=A3o=20de=20resposta=20seja=20list?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui-kit/src/components/MessagePreview/MessagePreview.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts b/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts index 04035b88..fe271f93 100644 --- a/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts +++ b/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts @@ -1,8 +1,9 @@ import { FC } from 'react'; export interface MessagePreviewProps { - unformattedText: string - buttons?: [object]; + unformattedText: string, + buttons?: [object], + list?: [object], media?: string | undefined | null, header?: string | undefined | null, footer?: string | undefined | null, From 16122ca34da8811ec473363f6b68ea7368ccee83 Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Mon, 28 Aug 2023 17:49:20 -0300 Subject: [PATCH 3/6] =?UTF-8?q?[TS-950]=20[TS-1582]=20-=20Ajustar=20a=20pr?= =?UTF-8?q?=C3=A9-visualiza=C3=A7ao=20de=20mensagem=20para=20contemplar=20?= =?UTF-8?q?n=C3=B3s=20cuja=20op=C3=A7=C3=A3o=20de=20resposta=20seja=20list?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui-kit/src/components/MessagePreview/MessagePreview.d.ts | 2 +- .../ui-kit/src/components/MessagePreview/MessagePreview.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts b/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts index fe271f93..495f4087 100644 --- a/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts +++ b/packages/ui-kit/src/components/MessagePreview/MessagePreview.d.ts @@ -3,7 +3,7 @@ import { FC } from 'react'; export interface MessagePreviewProps { unformattedText: string, buttons?: [object], - list?: [object], + sections?: [object], media?: string | undefined | null, header?: string | undefined | null, footer?: string | undefined | null, diff --git a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js index bb46d5a2..43636369 100644 --- a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js +++ b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js @@ -80,6 +80,8 @@ MessagePreview.propTypes = { unformattedText: PropTypes.string.isRequired, /** array of buttons that should be displayed */ buttons: PropTypes.array, + /** array of list items that should be displayed */ + sections: PropTypes.array, /** media link */ media: PropTypes.string, /** message header */ @@ -90,6 +92,7 @@ MessagePreview.propTypes = { MessagePreview.defaultProps = { buttons: [], + sections: [], media: undefined, header: undefined, footer: undefined, From 5fbedb815b798687a5b4b667a641de77b98586b3 Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Mon, 28 Aug 2023 18:36:46 -0300 Subject: [PATCH 4/6] Publish - @tecsinapse/carousel@2.7.6-alpha.0 - @tecsinapse/pickers@2.9.6-alpha.0 - @tecsinapse/table@4.1.6-alpha.0 - @tecsinapse/ui-kit@5.7.6-alpha.0 - @tecsinapse/uploader@2.7.6-alpha.0 - @tecsinapse/wizard@3.7.6-alpha.0 --- packages/carousel/package.json | 4 ++-- packages/pickers/package.json | 4 ++-- packages/table/package.json | 4 ++-- packages/ui-kit/package.json | 2 +- packages/uploader/package.json | 4 ++-- packages/wizard/package.json | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/carousel/package.json b/packages/carousel/package.json index 9bc03ce6..23ea304c 100644 --- a/packages/carousel/package.json +++ b/packages/carousel/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/carousel", "description": "TecSinapse Carousel", - "version": "2.7.5", + "version": "2.7.6-alpha.0", "main": "build/index.js", "module": "build/index.js", "author": { @@ -23,7 +23,7 @@ "ui-kit" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.5", + "@tecsinapse/ui-kit": "^5.7.6-alpha.0", "material-ui-dots": "^2.0.2", "react-swipeable-views": "^0.13.9", "react-swipeable-views-utils": "^0.13.9" diff --git a/packages/pickers/package.json b/packages/pickers/package.json index b0d55fa9..f9eb0f38 100644 --- a/packages/pickers/package.json +++ b/packages/pickers/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/pickers", "description": "TecSinapse Pickers", - "version": "2.9.5", + "version": "2.9.6-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -28,7 +28,7 @@ "@date-io/date-fns": "^1.3.13", "@material-ui/pickers": "^3.2.10", "@tecsinapse/material-ui-color-picker": "^4.4.0", - "@tecsinapse/ui-kit": "^5.7.5", + "@tecsinapse/ui-kit": "^5.7.6-alpha.0", "date-fns": "^2.28.0" }, "files": [ diff --git a/packages/table/package.json b/packages/table/package.json index f27930b5..0c2ba0ec 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/table", "description": "TecSinapse Table", - "version": "4.1.5", + "version": "4.1.6-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -23,7 +23,7 @@ "ui-kit" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.5", + "@tecsinapse/ui-kit": "^5.7.6-alpha.0", "react-virtualized": "^9.22.3" }, "files": [ diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index c9100713..9da9da8f 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/ui-kit", "description": "TecSinapse UI-KIT", - "version": "5.7.5", + "version": "5.7.6-alpha.0", "main": "build/index.js", "module": "build/index.js", "repository": { diff --git a/packages/uploader/package.json b/packages/uploader/package.json index c716db81..7f6c27eb 100644 --- a/packages/uploader/package.json +++ b/packages/uploader/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/uploader", "description": "TecSinapse Uploader", - "version": "2.7.5", + "version": "2.7.6-alpha.0", "main": "build/index.js", "typings": "build/index.d.js", "author": { @@ -23,7 +23,7 @@ "uploader" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.5", + "@tecsinapse/ui-kit": "^5.7.6-alpha.0", "react-dropzone": "^11.3.1", "uniqid": "^5.3.0" }, diff --git a/packages/wizard/package.json b/packages/wizard/package.json index 0e2fdb34..df7ddc46 100644 --- a/packages/wizard/package.json +++ b/packages/wizard/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/wizard", "description": "TecSinapse Wizard", - "version": "3.7.5", + "version": "3.7.6-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -23,7 +23,7 @@ "wizard" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.5" + "@tecsinapse/ui-kit": "^5.7.6-alpha.0" }, "files": [ "build", From 9a25b269ec9e966b9921030509e3aae28ebe8c90 Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Thu, 31 Aug 2023 10:15:09 -0300 Subject: [PATCH 5/6] =?UTF-8?q?[TS-950]=20[TS-1582]=20-=20Ajustar=20a=20pr?= =?UTF-8?q?=C3=A9-visualiza=C3=A7ao=20de=20mensagem=20para=20contemplar=20?= =?UTF-8?q?n=C3=B3s=20cuja=20op=C3=A7=C3=A3o=20de=20resposta=20seja=20list?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/MessagePreview/MessagePreview.js | 12 ++++++------ .../ui-kit/src/components/MessagePreview/styles.js | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js index 43636369..8f50b90c 100644 --- a/packages/ui-kit/src/components/MessagePreview/MessagePreview.js +++ b/packages/ui-kit/src/components/MessagePreview/MessagePreview.js @@ -56,13 +56,13 @@ export const MessagePreview = ({
{footer &&
{footer}
}
{currentTime()}
+ {sections?.length > 0 && buttons?.length === 0 && ( + + + + + )}
- {sections?.length > 0 && buttons?.length === 0 && ( - - - - - )} {buttons?.length > 0 && ( diff --git a/packages/ui-kit/src/components/MessagePreview/styles.js b/packages/ui-kit/src/components/MessagePreview/styles.js index 6245123c..706452d2 100644 --- a/packages/ui-kit/src/components/MessagePreview/styles.js +++ b/packages/ui-kit/src/components/MessagePreview/styles.js @@ -43,7 +43,7 @@ export const cardStyle = () => ({ display: 'flex', flexDirection: 'column', alignItems: 'flex-start', - padding: '10px', + padding: '10px 10px 0px 10px', gap: '10px', background: '#ffffff', borderRadius: '0px 6px 6px 6px', @@ -88,7 +88,6 @@ export const cardStyle = () => ({ width: '100%', }, textTime: { - marginBottom: '-5px', fontSize: '9px', lineHeight: '11px', alignItems: 'center', From ac239878f1b5dd6f582b9b670457440b68c9f932 Mon Sep 17 00:00:00 2001 From: Brenneguer Date: Thu, 31 Aug 2023 10:16:40 -0300 Subject: [PATCH 6/6] Publish - @tecsinapse/carousel@2.7.7-alpha.0 - @tecsinapse/pickers@2.9.7-alpha.0 - @tecsinapse/table@4.1.7-alpha.0 - @tecsinapse/ui-kit@5.7.7-alpha.0 - @tecsinapse/uploader@2.7.7-alpha.0 - @tecsinapse/wizard@3.7.7-alpha.0 --- packages/carousel/package.json | 4 ++-- packages/pickers/package.json | 4 ++-- packages/table/package.json | 4 ++-- packages/ui-kit/package.json | 2 +- packages/uploader/package.json | 4 ++-- packages/wizard/package.json | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/carousel/package.json b/packages/carousel/package.json index 23ea304c..adcebc9d 100644 --- a/packages/carousel/package.json +++ b/packages/carousel/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/carousel", "description": "TecSinapse Carousel", - "version": "2.7.6-alpha.0", + "version": "2.7.7-alpha.0", "main": "build/index.js", "module": "build/index.js", "author": { @@ -23,7 +23,7 @@ "ui-kit" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.6-alpha.0", + "@tecsinapse/ui-kit": "^5.7.7-alpha.0", "material-ui-dots": "^2.0.2", "react-swipeable-views": "^0.13.9", "react-swipeable-views-utils": "^0.13.9" diff --git a/packages/pickers/package.json b/packages/pickers/package.json index f9eb0f38..470d9bdd 100644 --- a/packages/pickers/package.json +++ b/packages/pickers/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/pickers", "description": "TecSinapse Pickers", - "version": "2.9.6-alpha.0", + "version": "2.9.7-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -28,7 +28,7 @@ "@date-io/date-fns": "^1.3.13", "@material-ui/pickers": "^3.2.10", "@tecsinapse/material-ui-color-picker": "^4.4.0", - "@tecsinapse/ui-kit": "^5.7.6-alpha.0", + "@tecsinapse/ui-kit": "^5.7.7-alpha.0", "date-fns": "^2.28.0" }, "files": [ diff --git a/packages/table/package.json b/packages/table/package.json index 0c2ba0ec..b5b230ec 100644 --- a/packages/table/package.json +++ b/packages/table/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/table", "description": "TecSinapse Table", - "version": "4.1.6-alpha.0", + "version": "4.1.7-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -23,7 +23,7 @@ "ui-kit" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.6-alpha.0", + "@tecsinapse/ui-kit": "^5.7.7-alpha.0", "react-virtualized": "^9.22.3" }, "files": [ diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index 9da9da8f..80d52d14 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/ui-kit", "description": "TecSinapse UI-KIT", - "version": "5.7.6-alpha.0", + "version": "5.7.7-alpha.0", "main": "build/index.js", "module": "build/index.js", "repository": { diff --git a/packages/uploader/package.json b/packages/uploader/package.json index 7f6c27eb..8c3e2e9c 100644 --- a/packages/uploader/package.json +++ b/packages/uploader/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/uploader", "description": "TecSinapse Uploader", - "version": "2.7.6-alpha.0", + "version": "2.7.7-alpha.0", "main": "build/index.js", "typings": "build/index.d.js", "author": { @@ -23,7 +23,7 @@ "uploader" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.6-alpha.0", + "@tecsinapse/ui-kit": "^5.7.7-alpha.0", "react-dropzone": "^11.3.1", "uniqid": "^5.3.0" }, diff --git a/packages/wizard/package.json b/packages/wizard/package.json index df7ddc46..806f1257 100644 --- a/packages/wizard/package.json +++ b/packages/wizard/package.json @@ -1,7 +1,7 @@ { "name": "@tecsinapse/wizard", "description": "TecSinapse Wizard", - "version": "3.7.6-alpha.0", + "version": "3.7.7-alpha.0", "main": "build/index.js", "typings": "build/index.d.ts", "author": { @@ -23,7 +23,7 @@ "wizard" ], "dependencies": { - "@tecsinapse/ui-kit": "^5.7.6-alpha.0" + "@tecsinapse/ui-kit": "^5.7.7-alpha.0" }, "files": [ "build",