Skip to content

A free and open-source block-based email template builder.

Using spacer inside of editor-sample (#18)

cohitrec9c7d9b8399b
diff --git a/packages/editor-sample/package-lock.json b/packages/editor-sample/package-lock.json
index 9af155b..f70017a 100644
--- a/packages/editor-sample/package-lock.json
+++ b/packages/editor-sample/package-lock.json
@@ -13,6 +13,7 @@
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"@usewaypoint/block-heading": "^0.0.1",
+ "@usewaypoint/block-spacer": "^0.0.1",
"@usewaypoint/document-core": "^0.0.1",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
@@ -1849,6 +1850,15 @@
"zod": "^1 || ^2 || ^3"
}
},
+ "node_modules/@usewaypoint/block-spacer": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/@usewaypoint/block-spacer/-/block-spacer-0.0.1.tgz",
+ "integrity": "sha512-O+C0pw2NElaKac5SDMR3Cb4874Gs3ewrwjjLad37bjWnxFSqYSxBEciF7W9BwM4mNlcw1aldu7fd3eQ9XaaQfw==",
+ "peerDependencies": {
+ "react": "^16 || ^17 || ^18",
+ "zod": "^1 || ^2 || ^3"
+ }
+ },
"node_modules/@usewaypoint/document-core": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/@usewaypoint/document-core/-/document-core-0.0.1.tgz",
diff --git a/packages/editor-sample/package.json b/packages/editor-sample/package.json
index eb23779..06c2789 100644
--- a/packages/editor-sample/package.json
+++ b/packages/editor-sample/package.json
@@ -13,6 +13,7 @@
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"@usewaypoint/block-heading": "^0.0.1",
+ "@usewaypoint/block-spacer": "^0.0.1",
"@usewaypoint/document-core": "^0.0.1",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
diff --git a/packages/editor-sample/src/App/sidebar/ConfigurationPanel/input-panels/SpacerSidebarPanel.tsx b/packages/editor-sample/src/App/sidebar/ConfigurationPanel/input-panels/SpacerSidebarPanel.tsx
index d8cf45f..b7fc53b 100644
--- a/packages/editor-sample/src/App/sidebar/ConfigurationPanel/input-panels/SpacerSidebarPanel.tsx
+++ b/packages/editor-sample/src/App/sidebar/ConfigurationPanel/input-panels/SpacerSidebarPanel.tsx
@@ -1,8 +1,7 @@
import React, { useState } from 'react';
import { HeightOutlined } from '@mui/icons-material';
-
-import { SpacerProps, SpacerPropsSchema } from '../../../../documents/blocks/Spacer';
+import { SpacerProps, SpacerPropsSchema } from '@usewaypoint/block-spacer';
import BaseSidebarPanel from './helpers/BaseSidebarPanel';
import SliderInput from './helpers/inputs/SliderInput';
@@ -33,7 +32,7 @@ export default function SpacerSidebarPanel({ data, setData }: SpacerSidebarPanel
step={4}
min={4}
max={128}
- defaultValue={data.props.height}
+ defaultValue={data.props.height ?? 16}
onChange={(height) => updateData({ ...data, props: { ...data.props, height } })}
/>
</BaseSidebarPanel>
diff --git a/packages/editor-sample/src/documents/blocks/Spacer.tsx b/packages/editor-sample/src/documents/blocks/Spacer.tsx
deleted file mode 100644
index 587bffc..0000000
--- a/packages/editor-sample/src/documents/blocks/Spacer.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { z } from 'zod';
-
-export const SpacerPropsSchema = z.object({
- style: z.object({}).default({}),
- props: z
- .object({
- height: z.number().default(16),
- })
- .default({}),
-});
-
-export type SpacerProps = z.infer<typeof SpacerPropsSchema>;
-
-export function Spacer({ props: { height } }: SpacerProps) {
- return <div style={{ height: `${height}px` }} />;
-}
diff --git a/packages/editor-sample/src/documents/blocks/helpers/EditorChildrenIds/AddBlockMenu/buttons.tsx b/packages/editor-sample/src/documents/blocks/helpers/EditorChildrenIds/AddBlockMenu/buttons.tsx
index d8199b2..b543871 100644
--- a/packages/editor-sample/src/documents/blocks/helpers/EditorChildrenIds/AddBlockMenu/buttons.tsx
+++ b/packages/editor-sample/src/documents/blocks/helpers/EditorChildrenIds/AddBlockMenu/buttons.tsx
@@ -13,6 +13,7 @@ import {
ViewColumnOutlined,
} from '@mui/icons-material';
import { HeadingPropsSchema } from '@usewaypoint/block-heading';
+import { SpacerPropsSchema } from '@usewaypoint/block-spacer';
import { TEditorBlock } from '../../../../editor/core';
import { AvatarPropsSchema } from '../../../Avatar';
@@ -22,7 +23,6 @@ import { ContainerPropsSchema } from '../../../Container';
import { DividerPropsSchema } from '../../../Divider';
import { HtmlPropsSchema } from '../../../Html';
import { ImagePropsSchema } from '../../../Image';
-import { SpacerPropsSchema } from '../../../Spacer';
import { TextPropsSchema } from '../../../Text';
type TButtonProps = {
diff --git a/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/EditorBlockWrapper.tsx b/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/EditorBlockWrapper.tsx
index f18b486..d6b0ac4 100644
--- a/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/EditorBlockWrapper.tsx
+++ b/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/EditorBlockWrapper.tsx
@@ -4,17 +4,14 @@ import { Box } from '@mui/material';
import { useCurrentBlockId } from '../../../editor/EditorBlock';
import { useEditorState } from '../../../editor/EditorContext';
-import { TStyle } from '../TStyle';
-import ReaderBlockWrapper from './ReaderBlockWrapper';
import TuneMenu from './TuneMenu';
type TEditorBlockWrapperProps = {
- style: TStyle;
children: JSX.Element;
};
-export default function EditorBlockWrapper({ style, children }: TEditorBlockWrapperProps) {
+export default function EditorBlockWrapper({ children }: TEditorBlockWrapperProps) {
const [{ selectedBlockId }, setEditorState] = useEditorState();
const [mouseInside, setMouseInside] = useState(false);
const blockId = useCurrentBlockId();
@@ -59,7 +56,7 @@ export default function EditorBlockWrapper({ style, children }: TEditorBlockWrap
}}
>
{renderMenu()}
- <ReaderBlockWrapper style={style}>{children}</ReaderBlockWrapper>
+ {children}
</Box>
);
}
diff --git a/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/index.tsx b/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/index.tsx
index 1e33bbb..4124542 100644
--- a/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/index.tsx
+++ b/packages/editor-sample/src/documents/blocks/helpers/block-wrappers/index.tsx
@@ -23,8 +23,10 @@ export function addReaderBlockWrapper<TProps extends TCommonProps>(ChildComponen
export function addEditorBlockWrapper<TProps extends TCommonProps>(ChildComponent: (props: TProps) => React.ReactNode) {
return (props: TProps) => {
return (
- <EditorBlockWrapper style={props.style}>
- <ChildComponent {...props} />
+ <EditorBlockWrapper>
+ <ReaderBlockWrapper style={props.style}>
+ <ChildComponent {...props} />
+ </ReaderBlockWrapper>
</EditorBlockWrapper>
);
};
diff --git a/packages/editor-sample/src/documents/editor/core.tsx b/packages/editor-sample/src/documents/editor/core.tsx
index bafa7d2..4c712c3 100644
--- a/packages/editor-sample/src/documents/editor/core.tsx
+++ b/packages/editor-sample/src/documents/editor/core.tsx
@@ -1,7 +1,8 @@
import React from 'react';
import { z } from 'zod';
-import { Heading, HeadingPropsSchema } from '@usewaypoint/block-heading';
+import { Heading, HeadingProps, HeadingPropsSchema } from '@usewaypoint/block-heading';
+import { Spacer, SpacerProps, SpacerPropsSchema } from '@usewaypoint/block-spacer';
import { buildBlockComponent, buildBlockConfigurationSchema } from '@usewaypoint/document-core';
import { Avatar, AvatarPropsSchema } from '../blocks/Avatar';
@@ -12,9 +13,9 @@ import { ContainerPropsSchema, EditorContainer } from '../blocks/Container';
import { Divider, DividerPropsSchema } from '../blocks/Divider';
import { EditorEmailLayout, EmailLayoutProps, EmailLayoutPropsSchema } from '../blocks/EmailLayout';
import { addEditorBlockWrapper } from '../blocks/helpers/block-wrappers';
+import EditorBlockWrapper from '../blocks/helpers/block-wrappers/EditorBlockWrapper';
import { Html, HtmlPropsSchema } from '../blocks/Html';
import { Image, ImagePropsSchema } from '../blocks/Image';
-import { Spacer, SpacerPropsSchema } from '../blocks/Spacer';
import { Text, TextPropsSchema } from '../blocks/Text';
const EDITOR_DICTIONARY = {
@@ -40,7 +41,11 @@ const EDITOR_DICTIONARY = {
},
Heading: {
schema: HeadingPropsSchema,
- Component: addEditorBlockWrapper(Heading),
+ Component: (props: HeadingProps) => (
+ <EditorBlockWrapper>
+ <Heading {...props} />
+ </EditorBlockWrapper>
+ ),
},
Html: {
schema: HtmlPropsSchema,
@@ -64,7 +69,11 @@ const EDITOR_DICTIONARY = {
},
Spacer: {
schema: SpacerPropsSchema,
- Component: addEditorBlockWrapper(Spacer),
+ Component: (props: SpacerProps) => (
+ <EditorBlockWrapper>
+ <Spacer {...props} />
+ </EditorBlockWrapper>
+ ),
},
};
diff --git a/packages/editor-sample/src/documents/reader/core.tsx b/packages/editor-sample/src/documents/reader/core.tsx
index c9ba743..86ce504 100644
--- a/packages/editor-sample/src/documents/reader/core.tsx
+++ b/packages/editor-sample/src/documents/reader/core.tsx
@@ -1,6 +1,7 @@
import { z } from 'zod';
import { Heading, HeadingPropsSchema } from '@usewaypoint/block-heading';
+import { Spacer, SpacerPropsSchema } from '@usewaypoint/block-spacer';
import { buildBlockComponent, buildBlockConfigurationSchema } from '@usewaypoint/document-core';
import { Avatar, AvatarPropsSchema } from '../blocks/Avatar';
@@ -13,7 +14,6 @@ import { EmailLayout, EmailLayoutPropsSchema } from '../blocks/EmailLayout';
import { addReaderBlockWrapper } from '../blocks/helpers/block-wrappers';
import { Html, HtmlPropsSchema } from '../blocks/Html';
import { Image, ImagePropsSchema } from '../blocks/Image';
-import { Spacer, SpacerPropsSchema } from '../blocks/Spacer';
import { Text, TextPropsSchema } from '../blocks/Text';
const READER_DICTIONARY = {
@@ -39,7 +39,7 @@ const READER_DICTIONARY = {
},
Heading: {
schema: HeadingPropsSchema,
- Component: addReaderBlockWrapper(Heading),
+ Component: Heading,
},
Html: {
schema: HtmlPropsSchema,
@@ -59,7 +59,7 @@ const READER_DICTIONARY = {
},
Spacer: {
schema: SpacerPropsSchema,
- Component: addReaderBlockWrapper(Spacer),
+ Component: Spacer,
},
};
diff --git a/packages/editor-sample/src/getConfiguration/sample/subscription-receipt.ts b/packages/editor-sample/src/getConfiguration/sample/subscription-receipt.ts
index fd9ea2c..8681329 100644
--- a/packages/editor-sample/src/getConfiguration/sample/subscription-receipt.ts
+++ b/packages/editor-sample/src/getConfiguration/sample/subscription-receipt.ts
@@ -786,25 +786,6 @@ const SUBSCRIPTION_RECEIPT: TEditorConfiguration = {
block_UQHMPb5NFLrY9PkWUckmHb: {
type: 'Spacer',
data: {
- style: {
- backgroundColor: null,
- border: null,
- borderRadius: null,
- color: null,
- fontFamily: null,
- fontSize: null,
- fontWeight: null,
- height: null,
- margin: null,
- maxHeight: null,
- maxWidth: null,
- minHeight: null,
- minWidth: null,
- padding: null,
- textAlign: null,
- textTransform: null,
- width: null,
- },
props: {
height: 24,
},