@micromag/core 0.3.34 → 0.3.35

package/es/hooks.js

@@ -1125,17 +1125,20 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
   var fullHeight = height !== null ? height : calculatedHeight;
 
   var _ref6 = opts || {},
+      _ref6$screenWidth = _ref6.screenWidth,
+      screenWidth = _ref6$screenWidth === void 0 ? 320 : _ref6$screenWidth,
+      _ref6$screenHeight = _ref6.screenHeight,
+      screenHeight = _ref6$screenHeight === void 0 ? 480 : _ref6$screenHeight,
       _ref6$withoutMaxSize = _ref6.withoutMaxSize,
       withoutMaxSize = _ref6$withoutMaxSize === void 0 ? false : _ref6$withoutMaxSize,
       _ref6$landscapeMinHei = _ref6.landscapeMinHeight,
       landscapeMinHeight = _ref6$landscapeMinHei === void 0 ? 600 : _ref6$landscapeMinHei,
-      _ref6$landscapeHeight = _ref6.landscapeHeightRatio,
-      landscapeHeightRatio = _ref6$landscapeHeight === void 0 ? 2 / 3 : _ref6$landscapeHeight,
-      _ref6$screenRatio = _ref6.screenRatio,
-      screenRatio = _ref6$screenRatio === void 0 ? 320 / 480 : _ref6$screenRatio,
       _ref6$landscapeMinRat = _ref6.landscapeMinRatio,
-      landscapeMinRatio = _ref6$landscapeMinRat === void 0 ? 2 / 3 : _ref6$landscapeMinRat;
+      landscapeMinRatio = _ref6$landscapeMinRat === void 0 ? 2 / 3 : _ref6$landscapeMinRat,
+      _ref6$withoutScale = _ref6.withoutScale,
+      withoutScale = _ref6$withoutScale === void 0 ? false : _ref6$withoutScale;
 
+  var screenRatio = screenWidth / screenHeight;
   var elementRatio = fullWidth / fullHeight;
   var landscape = fullHeight > 0 && elementRatio > (landscapeMinRatio || screenRatio);
   var landscapeWithMaxSize = landscape && !withoutMaxSize;
@@ -1147,7 +1150,7 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
     if (fullHeight < landscapeMinHeight) {
       menuOverScreen = true;
     } else {
-      finalHeight = Math.round(fullHeight * landscapeHeightRatio);
+      finalHeight = fullHeight - 100;
     }
 
     finalWidth = Math.round(finalHeight * screenRatio);
@@ -1161,15 +1164,17 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
     finalHeight -= 1;
   }
 
+  var scale = finalWidth / screenWidth;
   var screenSize = useScreenSize(_objectSpread({
-    width: finalWidth,
-    height: finalHeight,
+    width: withoutScale ? finalWidth : screenWidth,
+    height: withoutScale ? finalHeight : finalHeight / scale,
     landscape: landscape,
     menuOverScreen: menuOverScreen
   }, opts));
   return {
     ref: ref,
-    screenSize: screenSize
+    screenSize: screenSize,
+    scale: !withoutScale ? scale : null
   };
 };
 

package/lib/hooks.js

@@ -1161,17 +1161,20 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
   var fullHeight = height !== null ? height : calculatedHeight;
 
   var _ref6 = opts || {},
+      _ref6$screenWidth = _ref6.screenWidth,
+      screenWidth = _ref6$screenWidth === void 0 ? 320 : _ref6$screenWidth,
+      _ref6$screenHeight = _ref6.screenHeight,
+      screenHeight = _ref6$screenHeight === void 0 ? 480 : _ref6$screenHeight,
       _ref6$withoutMaxSize = _ref6.withoutMaxSize,
       withoutMaxSize = _ref6$withoutMaxSize === void 0 ? false : _ref6$withoutMaxSize,
       _ref6$landscapeMinHei = _ref6.landscapeMinHeight,
       landscapeMinHeight = _ref6$landscapeMinHei === void 0 ? 600 : _ref6$landscapeMinHei,
-      _ref6$landscapeHeight = _ref6.landscapeHeightRatio,
-      landscapeHeightRatio = _ref6$landscapeHeight === void 0 ? 2 / 3 : _ref6$landscapeHeight,
-      _ref6$screenRatio = _ref6.screenRatio,
-      screenRatio = _ref6$screenRatio === void 0 ? 320 / 480 : _ref6$screenRatio,
       _ref6$landscapeMinRat = _ref6.landscapeMinRatio,
-      landscapeMinRatio = _ref6$landscapeMinRat === void 0 ? 2 / 3 : _ref6$landscapeMinRat;
+      landscapeMinRatio = _ref6$landscapeMinRat === void 0 ? 2 / 3 : _ref6$landscapeMinRat,
+      _ref6$withoutScale = _ref6.withoutScale,
+      withoutScale = _ref6$withoutScale === void 0 ? false : _ref6$withoutScale;
 
+  var screenRatio = screenWidth / screenHeight;
   var elementRatio = fullWidth / fullHeight;
   var landscape = fullHeight > 0 && elementRatio > (landscapeMinRatio || screenRatio);
   var landscapeWithMaxSize = landscape && !withoutMaxSize;
@@ -1183,7 +1186,7 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
     if (fullHeight < landscapeMinHeight) {
       menuOverScreen = true;
     } else {
-      finalHeight = Math.round(fullHeight * landscapeHeightRatio);
+      finalHeight = fullHeight - 100;
     }
 
     finalWidth = Math.round(finalHeight * screenRatio);
@@ -1197,15 +1200,17 @@ var useScreenSizeFromElement = function useScreenSizeFromElement() {
     finalHeight -= 1;
   }
 
+  var scale = finalWidth / screenWidth;
   var screenSize = useScreenSize(_objectSpread__default["default"]({
-    width: finalWidth,
-    height: finalHeight,
+    width: withoutScale ? finalWidth : screenWidth,
+    height: withoutScale ? finalHeight : finalHeight / scale,
     landscape: landscape,
     menuOverScreen: menuOverScreen
   }, opts));
   return {
     ref: ref,
-    screenSize: screenSize
+    screenSize: screenSize,
+    scale: !withoutScale ? scale : null
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.34",
+    "version": "0.3.35",
     "description": "",
     "keywords": [
         "javascript"
@@ -132,5 +132,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f8332cb20e6c8cf2cbdba28fc965877684174b2f"
+    "gitHead": "4fd919d4dadf04fd8265b6bae91a9c5b77981db0"
 }