Skip to content

Commit f8f06ec

Browse files
committed
Transfer separator features to the add-on
1 parent c67ac63 commit f8f06ec

2 files changed

Lines changed: 2 additions & 56 deletions

File tree

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,7 @@
1-
import { defineMessages } from 'react-intl';
21
import { defaultStylingSchema } from '../schema';
32

4-
const messages = defineMessages({
5-
BlockWidth: {
6-
id: 'Block Width',
7-
defaultMessage: 'Block Width',
8-
},
9-
Alignment: {
10-
id: 'Alignment',
11-
defaultMessage: 'Alignment',
12-
},
13-
shortline: {
14-
id: 'Short line',
15-
defaultMessage: 'Short line',
16-
},
17-
});
18-
193
export const SeparatorStylingSchema = ({ schema, formData, intl }) => {
204
defaultStylingSchema({ schema, formData, intl });
215

22-
schema.properties.styles.schema.fieldsets[0].fields = [
23-
'blockWidth:noprefix',
24-
...schema.properties.styles.schema.fieldsets[0].fields,
25-
];
26-
27-
schema.properties.styles.schema.properties['blockWidth:noprefix'] = {
28-
widget: 'blockWidth',
29-
title: intl.formatMessage(messages.BlockWidth),
30-
default: 'default',
31-
filterActions: ['narrow', 'default'],
32-
};
33-
34-
schema.properties.styles.schema.fieldsets[0].fields = [
35-
'align:noprefix',
36-
...schema.properties.styles.schema.fieldsets[0].fields,
37-
];
38-
39-
schema.properties.styles.schema.properties['align:noprefix'] = {
40-
widget: 'blockAlignment',
41-
title: intl.formatMessage(messages.Alignment),
42-
default: 'left',
43-
};
44-
45-
schema.properties.styles.schema.fieldsets[0].fields = [
46-
'shortLine',
47-
...schema.properties.styles.schema.fieldsets[0].fields,
48-
];
49-
50-
schema.properties.styles.schema.properties.shortLine = {
51-
title: intl.formatMessage(messages.shortline),
52-
type: 'boolean',
53-
};
54-
55-
schema.properties.styles.schema.properties['align:noprefix'].disabled =
56-
!formData?.styles?.shortLine;
57-
586
return schema;
597
};

frontend/packages/volto-light-theme/src/config/blocks.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,8 @@ export default function install(config: ConfigType) {
401401

402402
// Check if the separator is present before enhancing it
403403
if (config.blocks.blocksConfig?.separator?.id) {
404-
config.blocks.blocksConfig.separator = {
405-
...config.blocks.blocksConfig.separator,
406-
schemaEnhancer: SeparatorStylingSchema,
407-
};
404+
config.blocks.blocksConfig.separator.schemaEnhancer =
405+
SeparatorStylingSchema;
408406
}
409407

410408
// TOC Block

0 commit comments

Comments
 (0)