Skip to content

Commit

Permalink
Merge pull request #107 from eea/develop
Browse files Browse the repository at this point in the history
fix(volto-block-style): performance by conditionally calling connect screen state to StyleWrapperView
  • Loading branch information
avoinea authored Dec 18, 2024
2 parents b80afe9 + 95dc532 commit 138dfb4
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 5 deletions.
40 changes: 39 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [7.2.1](https://github.com/eea/volto-block-style/compare/7.2.0...7.2.1) - 18 December 2024

#### :bug: Bug Fixes

- fix(volto-block-style): performance by conditionally calling connect screen state to StyleWrapperView [David Ichim - [`70b89b5`](https://github.com/eea/volto-block-style/commit/70b89b5710856c9668ed4ab2c47549ebabf6dbc5)]

### [7.2.0](https://github.com/eea/volto-block-style/compare/7.1.0...7.2.0) - 11 November 2024

#### :hammer_and_wrench: Others

- fix sonarqube bugs [Miu Razvan - [`8f72687`](https://github.com/eea/volto-block-style/commit/8f726879960ac699b5c1028297c462de5c1818d0)]
- update [Miu Razvan - [`2c2197e`](https://github.com/eea/volto-block-style/commit/2c2197ea01db9f2def9549133669634d9aa94023)]
- bump version [Miu Razvan - [`3d74398`](https://github.com/eea/volto-block-style/commit/3d7439854251974afe831370d45ebaf9d01b77a1)]
- fix block style on slate, ref #278618 [Miu Razvan - [`ce9982d`](https://github.com/eea/volto-block-style/commit/ce9982df68c8ce9a1f60cf72178060e1ddce480f)]
### [7.1.0](https://github.com/eea/volto-block-style/compare/7.0.0...7.1.0) - 3 June 2024

#### :hammer_and_wrench: Others
Expand All @@ -31,6 +36,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`993c572`](https://github.com/eea/volto-block-style/commit/993c57271e501e9d93998d4480677f1c4c2d6973)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`d6919bb`](https://github.com/eea/volto-block-style/commit/d6919bb15f751b0ea259d21b948c42c7c00d55d5)]
- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`5524d95`](https://github.com/eea/volto-block-style/commit/5524d95c53f937e893b1d5042bc6ba796dd444d0)]
### [6.1.0](https://github.com/eea/volto-block-style/compare/6.0.0...6.1.0) - 1 February 2024

#### :bug: Bug Fixes
Expand All @@ -53,19 +61,26 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Add i18n support and pt_BR translation #88 from andreclimaco/develop [ichim-david - [`8ff6dae`](https://github.com/eea/volto-block-style/commit/8ff6dae61960999f7d4d7a5ad1217a0311d18490)]
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`302006a`](https://github.com/eea/volto-block-style/commit/302006ab4331c4ee5ba72e77157029e6e60743c1)]
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`42c89fa`](https://github.com/eea/volto-block-style/commit/42c89fad9272403998a4a80f0fd8561bc09947fc)]
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`ae18833`](https://github.com/eea/volto-block-style/commit/ae1883355d61d0a40ab51a47d0f11c3a99055512)]
- Add i18n support and pt_BR translation [André Clímaco - [`7c65445`](https://github.com/eea/volto-block-style/commit/7c65445ab8208b963fc12536bb4162c3109d7933)]
## [6.0.0](https://github.com/eea/volto-block-style/compare/5.2.6...6.0.0) - 8 December 2023

#### :house: Internal changes

- chore: add screenshot [laszlocseh - [`a03fd32`](https://github.com/eea/volto-block-style/commit/a03fd326ea8f69a999c7c436a5024163a0a1dab4)]
- chore: remove some custom classes [laszlocseh - [`9897df8`](https://github.com/eea/volto-block-style/commit/9897df85b09b6cd3f2e895574f05780b1d9a1350)]
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`de89384`](https://github.com/eea/volto-block-style/commit/de8938467e46d64a2d65489af375d677cf12c97b)]

#### :hammer_and_wrench: Others

- Release 6.0.0 [Alin Voinea - [`ae300f2`](https://github.com/eea/volto-block-style/commit/ae300f214d457fc52bcff36e72dac70fc297cebf)]
- Update README.md [Laszlo Cseh - [`e42289c`](https://github.com/eea/volto-block-style/commit/e42289cf9c6194b4c490d5021c9522040de3f281)]
- refs #261398: added customization to use blocks as page header [laszlocseh - [`a22b745`](https://github.com/eea/volto-block-style/commit/a22b745a5c9607d647d76ceb30c4c26b7bfde94a)]
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`7409b6b`](https://github.com/eea/volto-block-style/commit/7409b6bb14b2b1284f533d646a89ea58bacc2050)]
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`d6cf5c6`](https://github.com/eea/volto-block-style/commit/d6cf5c6708c7678793cf5c5cb96d144520fb2523)]
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`96a498b`](https://github.com/eea/volto-block-style/commit/96a498b63c21e1f67d4c5a74710507ad7491cbea)]
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`d1fcc77`](https://github.com/eea/volto-block-style/commit/d1fcc77bbd3e50114f02f1dee41c3370105ed997)]
- test: [JENKINS] Improve cypress time [valentinab25 - [`2e6a455`](https://github.com/eea/volto-block-style/commit/2e6a455797c4d5ec91e8b8bc385673e337aa9eab)]
### [5.2.6](https://github.com/eea/volto-block-style/compare/5.2.5...5.2.6) - 22 October 2023

#### :house: Internal changes
Expand Down Expand Up @@ -110,6 +125,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`cf81a8e`](https://github.com/eea/volto-block-style/commit/cf81a8ee6b5549357f59217e3ae432be831746a3)]
- test: Fix eslint and yarn i18n [Alin Voinea - [`ce41324`](https://github.com/eea/volto-block-style/commit/ce41324feea60679910349cfaf7d8a604fd4b287)]
- i18n: Add en [Alin Voinea - [`1f4fe2e`](https://github.com/eea/volto-block-style/commit/1f4fe2e66c6a5a92e22c10cff9086b84b2d7c0c1)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`b8b8a3c`](https://github.com/eea/volto-block-style/commit/b8b8a3c8e36b64556eeaaf6ad4811c34efab3f4a)]
### [5.2.2](https://github.com/eea/volto-block-style/compare/5.2.1...5.2.2) - 24 July 2023
Expand All @@ -130,6 +146,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`458b2f8`](https://github.com/eea/volto-block-style/commit/458b2f86dd2ae6ec5d892bc1501947c48eb829bb)]

#### :hammer_and_wrench: Others

Expand All @@ -151,10 +168,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`06a29bd`](https://github.com/eea/volto-block-style/commit/06a29bd888f9625c28cd93bfc8e1aef581ec228a)]
### [5.1.0](https://github.com/eea/volto-block-style/compare/5.0.1...5.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`1ee1797`](https://github.com/eea/volto-block-style/commit/1ee1797997c115e997edeaca234ad3d66b901564)]
### [5.0.1](https://github.com/eea/volto-block-style/compare/5.0.0...5.0.1) - 8 February 2023

## [5.0.0](https://github.com/eea/volto-block-style/compare/4.1.2...5.0.0) - 7 February 2023
Expand All @@ -166,7 +185,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Add theme picker widget [dana-cfc4 - [`4bbdec3`](https://github.com/eea/volto-block-style/commit/4bbdec33ac328873758c3a6ee03a41b53e2fb5a8)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`e6ffe28`](https://github.com/eea/volto-block-style/commit/e6ffe283a571157ef99df399a75fd90e88797925)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`0575439`](https://github.com/eea/volto-block-style/commit/0575439dd8967e28281277d91d6d69fc54a1e714)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`564c363`](https://github.com/eea/volto-block-style/commit/564c36374879ee6810fed58dc2ef8ee01751ec35)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`0ff5a93`](https://github.com/eea/volto-block-style/commit/0ff5a938ef53f349dde941671079d37e91db58e0)]
### [4.1.2](https://github.com/eea/volto-block-style/compare/4.1.1...4.1.2) - 29 November 2022

#### :nail_care: Enhancements
Expand All @@ -175,6 +197,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- yarn 3 [Alin Voinea - [`9505f8c`](https://github.com/eea/volto-block-style/commit/9505f8cb21b38586fbe06efd8da353861691bc98)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`831f4fa`](https://github.com/eea/volto-block-style/commit/831f4fadd1b60fe47b9fd5352031fd2cc3462a3d)]
### [4.1.1](https://github.com/eea/volto-block-style/compare/4.1.0...4.1.1) - 16 November 2022

#### :nail_care: Enhancements
Expand Down Expand Up @@ -202,6 +226,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Bring this up to date [Miu Razvan - [`6d7e7a4`](https://github.com/eea/volto-block-style/commit/6d7e7a46078d858800eb894ffb1eba42bdd384e0)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`5529469`](https://github.com/eea/volto-block-style/commit/5529469b468e67300ba9cfca415f6b7bbf1ea0e4)]
### [3.7.2](https://github.com/eea/volto-block-style/compare/3.7.1...3.7.2) - 27 September 2022

#### :bug: Bug Fixes
Expand All @@ -217,6 +242,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`928339f`](https://github.com/eea/volto-block-style/commit/928339ffd2991b24844a9ca3691523d7e692ca91)]
### [3.7.0](https://github.com/eea/volto-block-style/compare/3.6.3...3.7.0) - 22 September 2022

#### :hammer_and_wrench: Others
Expand All @@ -236,11 +262,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`c8977dc`](https://github.com/eea/volto-block-style/commit/c8977dc8d8f623601c763aff13c1a8df5fd1eb13)]
### [3.6.0](https://github.com/eea/volto-block-style/compare/3.5.18...3.6.0) - 9 June 2022

#### :hammer_and_wrench: Others

- Release 3.6.0 [Alin Voinea - [`f0b6eb8`](https://github.com/eea/volto-block-style/commit/f0b6eb885feee2bb02fdd4daf6ee7a4747518b23)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`e7a6cf9`](https://github.com/eea/volto-block-style/commit/e7a6cf9ba635161d1222e2d5db4c83cb680e3ce2)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a648e9b`](https://github.com/eea/volto-block-style/commit/a648e9b7667bc496050c02c2fcc8b4a3a0a7af1c)]
### [3.5.18](https://github.com/eea/volto-block-style/compare/3.5.17...3.5.18) - 3 March 2022

### [3.5.17](https://github.com/eea/volto-block-style/compare/3.5.16...3.5.17) - 2 March 2022
Expand Down Expand Up @@ -301,6 +330,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ccd5b62`](https://github.com/eea/volto-block-style/commit/ccd5b622c05a9ee3d906d6eb5df0288fa25a694b)]
- added cy tests [Daniela Mormocea - [`ed8dc6f`](https://github.com/eea/volto-block-style/commit/ed8dc6f55f1f48cb84f6c9879eb4a728e1308639)]
### [3.5.8](https://github.com/eea/volto-block-style/compare/3.5.7...3.5.8) - 13 December 2021

Expand Down Expand Up @@ -330,17 +360,20 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`813a0f5`](https://github.com/eea/volto-block-style/commit/813a0f5a2d1f563b184475a3e6ff620a733ba5da)]
### [3.5.2](https://github.com/eea/volto-block-style/compare/3.5.1...3.5.2) - 29 October 2021

### [3.5.1](https://github.com/eea/volto-block-style/compare/3.5.0...3.5.1) - 19 October 2021

#### :hammer_and_wrench: Others

- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`8b20d02`](https://github.com/eea/volto-block-style/commit/8b20d02f809e456af84aaea5ad74115c00e39c3e)]
### [3.5.0](https://github.com/eea/volto-block-style/compare/3.4.5...3.5.0) - 25 September 2021

#### :hammer_and_wrench: Others

- Release 3.5.0 [Alin Voinea - [`0a5a98e`](https://github.com/eea/volto-block-style/commit/0a5a98e531f93470956673e50b6c71f37f59b49e)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`30bb3aa`](https://github.com/eea/volto-block-style/commit/30bb3aa5f49ed5264cf609d6b8f234b07b7988ca)]
### [3.4.5](https://github.com/eea/volto-block-style/compare/3.4.4...3.4.5) - 31 August 2021

#### :hammer_and_wrench: Others
Expand Down Expand Up @@ -397,6 +430,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Add range slider [Tiberiu Ichim - [`8a91ef1`](https://github.com/eea/volto-block-style/commit/8a91ef168df01e4a0f114596d50a401a14a41251)]
- Separate block wrapping; don't apply multiple times [Tiberiu Ichim - [`2adffd5`](https://github.com/eea/volto-block-style/commit/2adffd58a99af59bb42d72c54f2a05be3b9b2ea1)]
- Separate block wrapping; don't apply multiple times [Tiberiu Ichim - [`584e7a9`](https://github.com/eea/volto-block-style/commit/584e7a9859c7d417708f9aa78b83e94547f2f1ab)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`f6737ef`](https://github.com/eea/volto-block-style/commit/f6737ef68ba906c5fb72e18c77b060aa82ed0a73)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`6a4c6c1`](https://github.com/eea/volto-block-style/commit/6a4c6c16acc88471279a82a62b92555dc1ac20cc)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2101b55`](https://github.com/eea/volto-block-style/commit/2101b550588402b37cd91b5d582e27a6255d6cac)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2583c68`](https://github.com/eea/volto-block-style/commit/2583c68ea49ddbedc7b90b9d477cbbe4e2b779fd)]
- Add hidden toggle [Tiberiu Ichim - [`3b8ed26`](https://github.com/eea/volto-block-style/commit/3b8ed26a82c31ff430301adceea1174e92464a77)]
- Add a clear button to the box size widget [Tiberiu Ichim - [`4bdf803`](https://github.com/eea/volto-block-style/commit/4bdf8030d7a4d39d3a48b56ed6c8cddc311b3ff7)]
### [3.3.3](https://github.com/eea/volto-block-style/compare/3.3.2...3.3.3) - 25 June 2021
Expand Down Expand Up @@ -554,6 +591,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- React color ~2.18.1 [Alin Voinea - [`597da25`](https://github.com/eea/volto-block-style/commit/597da253f5266ecc9d0d6e10ee4d365432433416)]
- Cleanup [Alin Voinea - [`8fb40cf`](https://github.com/eea/volto-block-style/commit/8fb40cf4fe721cc26120ab1231d48c4c9eab88a9)]
- Fix README screenshot path [Alin Voinea - [`81f09ec`](https://github.com/eea/volto-block-style/commit/81f09ec9d95b3a555d0bc7e0aa3ad08b4ab005db)]
- yarn prettier [Alin Voinea - [`04f3b9a`](https://github.com/eea/volto-block-style/commit/04f3b9ae36ea8c6d99dad1f6d4cf56e81c032e1a)]
### [0.1.1](https://github.com/eea/volto-block-style/compare/0.1.0...0.1.1) - 22 October 2020

#### :hammer_and_wrench: Others
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-block-style",
"version": "7.2.0",
"version": "7.2.1",
"description": "volto-block-style: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
6 changes: 3 additions & 3 deletions src/StyleWrapper/StyleWrapperView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ const StyleWrapperView = (props) => {
);
};

export default connect((state, props) => ({
screen: state.screen,
}))(
export default connect((state, ownProps) =>
ownProps.styleData.isScreenHeight ? { screen: state.screen } : {},
)(
withCachedImages(StyleWrapperView, {
getImage: (props) => props.styleData.backgroundImage || null,
}),
Expand Down

0 comments on commit 138dfb4

Please sign in to comment.