Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add email preview text #130

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+128 −99
Open

Add email preview text #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...ample/src/App/InspectorDrawer/ConfigurationPanel/input-panels/EmailLayoutSidebarPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import BaseSidebarPanel from './helpers/BaseSidebarPanel';
import ColorInput, { NullableColorInput } from './helpers/inputs/ColorInput';
import { NullableFontFamily } from './helpers/inputs/FontFamily';
import SliderInput from './helpers/inputs/SliderInput';
import TextInput from './helpers/inputs/TextInput';

type EmailLayoutSidebarFieldsProps = {
data: EmailLayoutProps;
Expand Down Expand Up @@ -66,6 +67,12 @@ export default function EmailLayoutSidebarFields({ data, setData }: EmailLayoutS
defaultValue={data.textColor ?? '#262626'}
onChange={(textColor) => updateData({ ...data, textColor })}
/>
<TextInput
label="Preview text"
defaultValue=""
rows={5}
onChange={(previewText) => updateData({ ...data, previewText })}
/>
</BaseSidebarPanel>
);
}
130 changes: 70 additions & 60 deletions packages/editor-sample/src/documents/blocks/EmailLayout/EmailLayoutEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Fragment } from 'react';

import { useCurrentBlockId } from '../../editor/EditorBlock';
import { setDocument, setSelectedBlockId, useDocument } from '../../editor/EditorContext';
Expand Down Expand Up @@ -36,68 +36,78 @@ export default function EmailLayoutEditor(props: EmailLayoutProps) {
const currentBlockId = useCurrentBlockId();

return (
<div
onClick={() => {
setSelectedBlockId(null);
}}
style={{
backgroundColor: props.backdropColor ?? '#F5F5F5',
color: props.textColor ?? '#262626',
fontFamily: getFontFamily(props.fontFamily),
fontSize: '16px',
fontWeight: '400',
letterSpacing: '0.15008px',
lineHeight: '1.5',
margin: '0',
padding: '32px 0',
width: '100%',
minHeight: '100%',
}}
>
<table
align="center"
width="100%"
<Fragment>
{props.previewText && (
<div
style={{ display: 'none', maxHeight: '0px', overflow: 'hidden', 'mso-hide': 'all' } as React.CSSProperties}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[disclaimer: not a maintainer]

I don't think you don't need to add this mso-hide to the Editor as it won't be "visible", it's for Outlook only and it's throwing this:

image

>
{props.previewText}
&nbsp;&#8204;&nbsp;&#204;&nbsp;&#8204;&nbsp;
</div>
)}
<div
onClick={() => {
setSelectedBlockId(null);
}}
style={{
margin: '0 auto',
maxWidth: '600px',
backgroundColor: props.canvasColor ?? '#FFFFFF',
borderRadius: props.borderRadius ?? undefined,
border: (() => {
const v = props.borderColor;
if (!v) {
return undefined;
}
return `1px solid ${v}`;
})(),
backgroundColor: props.backdropColor ?? '#F5F5F5',
color: props.textColor ?? '#262626',
fontFamily: getFontFamily(props.fontFamily),
fontSize: '16px',
fontWeight: '400',
letterSpacing: '0.15008px',
lineHeight: '1.5',
margin: '0',
padding: '32px 0',
width: '100%',
minHeight: '100%',
}}
role="presentation"
cellSpacing="0"
cellPadding="0"
border={0}
>
<tbody>
<tr style={{ width: '100%' }}>
<td>
<EditorChildrenIds
childrenIds={childrenIds}
onChange={({ block, blockId, childrenIds }) => {
setDocument({
[blockId]: block,
[currentBlockId]: {
type: 'EmailLayout',
data: {
...document[currentBlockId].data,
childrenIds: childrenIds,
<table
align="center"
width="100%"
style={{
margin: '0 auto',
maxWidth: '600px',
backgroundColor: props.canvasColor ?? '#FFFFFF',
borderRadius: props.borderRadius ?? undefined,
border: (() => {
const v = props.borderColor;
if (!v) {
return undefined;
}
return `1px solid ${v}`;
})(),
}}
role="presentation"
cellSpacing="0"
cellPadding="0"
border={0}
>
<tbody>
<tr style={{ width: '100%' }}>
<td>
<EditorChildrenIds
childrenIds={childrenIds}
onChange={({ block, blockId, childrenIds }) => {
setDocument({
[blockId]: block,
[currentBlockId]: {
type: 'EmailLayout',
data: {
...document[currentBlockId].data,
childrenIds: childrenIds,
},
},
},
});
setSelectedBlockId(blockId);
}}
/>
</td>
</tr>
</tbody>
</table>
</div>
});
setSelectedBlockId(blockId);
}}
/>
</td>
</tr>
</tbody>
</table>
</div>
</Fragment>
);
}
1 change: 1 addition & 0 deletions packages/editor-sample/src/documents/blocks/EmailLayout/EmailLayoutPropsSchema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const EmailLayoutPropsSchema = z.object({
textColor: COLOR_SCHEMA,
fontFamily: FONT_FAMILY_SCHEMA,
childrenIds: z.array(z.string()).optional().nullable(),
previewText: z.string().optional().nullable(),
});

export default EmailLayoutPropsSchema;
Expand Down
1 change: 1 addition & 0 deletions packages/email-builder/src/blocks/EmailLayout/EmailLayoutPropsSchema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const EmailLayoutPropsSchema = z.object({
canvasColor: COLOR_SCHEMA,
textColor: COLOR_SCHEMA,
fontFamily: FONT_FAMILY_SCHEMA,
previewText: z.string().optional().nullable(),
childrenIds: z.array(z.string()).optional().nullable(),
});

Expand Down
88 changes: 49 additions & 39 deletions packages/email-builder/src/blocks/EmailLayout/EmailLayoutReader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Fragment } from 'react';

import { ReaderBlock } from '../../Reader/core';

Expand Down Expand Up @@ -38,46 +38,56 @@ function getBorder({ borderColor }: EmailLayoutProps) {
export default function EmailLayoutReader(props: EmailLayoutProps) {
const childrenIds = props.childrenIds ?? [];
return (
<div
style={{
backgroundColor: props.backdropColor ?? '#F5F5F5',
color: props.textColor ?? '#262626',
fontFamily: getFontFamily(props.fontFamily),
fontSize: '16px',
fontWeight: '400',
letterSpacing: '0.15008px',
lineHeight: '1.5',
margin: '0',
padding: '32px 0',
minHeight: '100%',
width: '100%',
}}
>
<table
align="center"
width="100%"
<Fragment>
{props.previewText && (
<div
style={{ display: 'none', maxHeight: '0px', overflow: 'hidden', 'mso-hide': 'all' } as React.CSSProperties}
>
{props.previewText}
&nbsp;&#8204;&nbsp;&#8204;&nbsp;&#8204;&nbsp;
</div>
)}
<div
style={{
margin: '0 auto',
maxWidth: '600px',
backgroundColor: props.canvasColor ?? '#FFFFFF',
borderRadius: props.borderRadius ?? undefined,
border: getBorder(props),
backgroundColor: props.backdropColor ?? '#F5F5F5',
color: props.textColor ?? '#262626',
fontFamily: getFontFamily(props.fontFamily),
fontSize: '16px',
fontWeight: '400',
letterSpacing: '0.15008px',
lineHeight: '1.5',
margin: '0',
padding: '32px 0',
minHeight: '100%',
width: '100%',
}}
role="presentation"
cellSpacing="0"
cellPadding="0"
border={0}
>
<tbody>
<tr style={{ width: '100%' }}>
<td>
{childrenIds.map((childId) => (
<ReaderBlock key={childId} id={childId} />
))}
</td>
</tr>
</tbody>
</table>
</div>
<table
align="center"
width="100%"
style={{
margin: '0 auto',
maxWidth: '600px',
backgroundColor: props.canvasColor ?? '#FFFFFF',
borderRadius: props.borderRadius ?? undefined,
border: getBorder(props),
}}
role="presentation"
cellSpacing="0"
cellPadding="0"
border={0}
>
<tbody>
<tr style={{ width: '100%' }}>
<td>
{childrenIds.map((childId) => (
<ReaderBlock key={childId} id={childId} />
))}
</td>
</tr>
</tbody>
</table>
</div>
</Fragment>
);
}