Merge pull request #17 from eea/develop

Better way to add screen height to blocks
eea · Jun 10, 2021 · 54bcfc2 · 54bcfc2
2 parents d507f84 + 1d6dbe6
commit 54bcfc2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,16 @@ 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).
 
+#### [3.3.1](https://github.com/eea/volto-block-style/compare/3.3.0...3.3.1)
+
+- Update package.json [`790d878`](https://github.com/eea/volto-block-style/commit/790d8786a15f0fea3dabaa4ac347b97c92a4f369)
+- Better way to add screen height to blocks [`2901621`](https://github.com/eea/volto-block-style/commit/2901621636b0d80de40e029d6cf90410d8bfef6f)
+
 #### [3.3.0](https://github.com/eea/volto-block-style/compare/3.2.5...3.3.0)
 
+> 4 June 2021
+
+- Develop [`#16`](https://github.com/eea/volto-block-style/pull/16)
 - Cleanup Jenkinsfile [`dfa2790`](https://github.com/eea/volto-block-style/commit/dfa2790afb144f8a38fc0f3459ff37bb9bc4352c)
 - Bump minor release [`a571d9e`](https://github.com/eea/volto-block-style/commit/a571d9ea1c4ac026af6eb973fe0b3386e4941466)
 - Jenkins dependencies [`90f047b`](https://github.com/eea/volto-block-style/commit/90f047b644e0bf8d20bda7452eb68175f13bb3a8)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-style",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "volto-block-style: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -24,7 +24,7 @@
     "react-color": "~2.18.1"
   },
   "devDependencies": {
-    "@eeacms/volto-resize-helper": "^0.1.1",
+    "@eeacms/volto-resize-helper": "^0.2.0",
     "@cypress/code-coverage": "^3.9.5",
     "babel-plugin-transform-class-properties": "^6.24.1"
   },

diff --git a/src/StyleWrapper/StyleWrapperView.jsx b/src/StyleWrapper/StyleWrapperView.jsx
@@ -10,10 +10,12 @@ export function getInlineStyles(data, props = {}) {
     ...(data.textColor ? { color: data.textColor } : {}),
     ...(data.textAlign ? { textAlign: data.textAlign } : {}),
     ...(data.fontSize ? { fontSize: data.fontSize } : {}),
-    ...(data.isScreenHeight && props.screen.screenHeight
+    ...(data.isScreenHeight && props.screen.height
       ? {
           minHeight: (
-            props.screen.screenHeight - props.screen.offsetHeight
+            props.screen.height -
+            props.screen.browserToolbarHeight -
+            props.screen.content.offsetTop
           ).toPixel(),
         }
       : {}),