@eeacms/volto-block-style
Advanced tools
Comparing version 6.1.0 to 7.0.0
@@ -7,2 +7,15 @@ ### Changelog | ||
### [7.0.0](https://github.com/eea/volto-block-style/compare/6.1.0...7.0.0) - 22 April 2024 | ||
#### :rocket: New Features | ||
- feat: Release 7.0.0 - Volto 17 support [alin - [`b73e6cf`](https://github.com/eea/volto-block-style/commit/b73e6cf73f17c0842141cfedbc6b105abb9b6782)] | ||
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`00c4627`](https://github.com/eea/volto-block-style/commit/00c4627f4ea194adbf8c6c9954f226fa64c9fa8a)] | ||
#### :bug: Bug Fixes | ||
- fix: Don't hard fail when block is missing [alin - [`4b38c0e`](https://github.com/eea/volto-block-style/commit/4b38c0e3023a2515356921eb484e4460d4d87c61)] | ||
#### :hammer_and_wrench: Others | ||
### [6.1.0](https://github.com/eea/volto-block-style/compare/6.0.0...6.1.0) - 1 February 2024 | ||
@@ -9,0 +22,0 @@ |
const { defineConfig } = require('cypress'); | ||
const fs = require('fs'); | ||
const path = require('path'); | ||
@@ -22,2 +24,17 @@ module.exports = defineConfig({ | ||
require('@cypress/code-coverage/task')(on, config); | ||
on('task', { | ||
getVoltoVersion() { | ||
const baseProjectRoot = path.resolve(__dirname, '../../../'); | ||
const packageJsonPath = path.join( | ||
baseProjectRoot, | ||
'node_modules/@plone/volto/package.json', | ||
); | ||
const contents = fs.readFileSync(packageJsonPath, 'utf-8'); | ||
const file = JSON.parse(contents); | ||
return file.version; | ||
}, | ||
}); | ||
return config; | ||
@@ -24,0 +41,0 @@ }, |
@@ -17,2 +17,4 @@ require('dotenv').config({ path: __dirname + '/.env' }) | ||
'@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1', | ||
'@eeacms/search/(.*)$': '<rootDir>/src/addons/volto-searchlib/searchlib/$1', | ||
'@eeacms/search': '<rootDir>/src/addons/volto-searchlib/searchlib', | ||
'@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2', | ||
@@ -32,2 +34,3 @@ '@plone/volto-slate$': | ||
'^.+\\.js(x)?$': 'babel-jest', | ||
'^.+\\.ts(x)?$': 'babel-jest', | ||
'^.+\\.(png)$': 'jest-file', | ||
@@ -34,0 +37,0 @@ '^.+\\.(jpg)$': 'jest-file', |
{ | ||
"name": "@eeacms/volto-block-style", | ||
"version": "6.1.0", | ||
"version": "7.0.0", | ||
"description": "volto-block-style: Volto add-on", | ||
@@ -5,0 +5,0 @@ "main": "src/index.js", |
@@ -24,3 +24,3 @@ import React from 'react'; | ||
let EditComponent = BaseEditComponent; | ||
if (!EditComponent._styleWrapped) { | ||
if (EditComponent && !EditComponent._styleWrapped) { | ||
EditComponent = (props) => ( | ||
@@ -37,3 +37,3 @@ <BlockStyleWrapperEdit {...props}> | ||
let ViewComponent = BaseViewComponent; | ||
if (!ViewComponent._styleWrapped) { | ||
if (ViewComponent && !ViewComponent._styleWrapped) { | ||
ViewComponent = (props) => ( | ||
@@ -40,0 +40,0 @@ <BlockStyleWrapperView {...props}> |
@@ -9,3 +9,3 @@ import React from 'react'; | ||
export default (props) => { | ||
const SimpleColorPicker = (props) => { | ||
const { id, value, onChange, available_colors } = props; | ||
@@ -60,1 +60,3 @@ const [showPicker, setShowPicker] = React.useState(false); | ||
}; | ||
export default SimpleColorPicker; |
@@ -9,6 +9,4 @@ import React from 'react'; | ||
const { id, value, onChange } = props; | ||
const { | ||
pluggableStyles = [], | ||
previewText = 'Block content', | ||
} = config.settings; | ||
const { pluggableStyles = [], previewText = 'Block content' } = | ||
config.settings; | ||
@@ -15,0 +13,0 @@ const renderPreview = React.useCallback( |
@@ -36,5 +36,7 @@ import alignLeftSVG from '@plone/volto/icons/align-left.svg'; | ||
export default (props) => { | ||
const TextAlign = (props) => { | ||
const actions = { actions: ['left', 'right', 'center', 'justify'] }; | ||
return AlignWidget(props, actions); | ||
}; | ||
export default TextAlign; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
190912
3189
6