From 0c98993be0de1fbf3f538b3b4026f855fb167ee3 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Thu, 29 Jun 2023 09:45:55 +0000
Subject: [PATCH] publish: Merge branch 'fix-ui-onload' into 'dev'
generated from commit 8764367f9bdd7394358aef2eccb2f7f8db9009b8
---
...04d6.js => ecolyo.dc7b4fa6e755df72417e.js} | 4 +-
...5e66.js => ecolyo.72a7eabe03dee9217ec1.js} | 5 ++-
...3ad4.js => ecolyo.81e10ab634b9f0913fac.js} | 38 +++++++++----------
index.html | 2 +-
4 files changed, 25 insertions(+), 24 deletions(-)
rename 3/{ecolyo.5c854707901b5b5504d6.js => ecolyo.dc7b4fa6e755df72417e.js} (99%)
rename 5/{ecolyo.e032256c323f91a65e66.js => ecolyo.72a7eabe03dee9217ec1.js} (99%)
rename app/{ecolyo.0a3b91f6b431f1403ad4.js => ecolyo.81e10ab634b9f0913fac.js} (99%)
diff --git a/3/ecolyo.5c854707901b5b5504d6.js b/3/ecolyo.dc7b4fa6e755df72417e.js
similarity index 99%
rename from 3/ecolyo.5c854707901b5b5504d6.js
rename to 3/ecolyo.dc7b4fa6e755df72417e.js
index 5944c2f5f..bed6ed37f 100644
--- a/3/ecolyo.5c854707901b5b5504d6.js
+++ b/3/ecolyo.dc7b4fa6e755df72417e.js
@@ -1083,7 +1083,7 @@ var MaxConsumptionCard = function MaxConsumptionCard() {
var containerRef = (0, _react.useRef)(null);
- var _useChartResize = (0, _useChartResize2.useChartResize)(containerRef, 250, 940),
+ var _useChartResize = (0, _useChartResize2.useChartResize)(containerRef, isLoading, 250, 940),
height = _useChartResize.height,
width = _useChartResize.width;
@@ -2587,7 +2587,7 @@ var ElecHalfHourChart = function ElecHalfHourChart(_ref) {
isWeekend = _ref.isWeekend;
var chartContainer = (0, _react.useRef)(null);
- var _useChartResize = (0, _useChartResize2.useChartResize)(chartContainer, 170, 940),
+ var _useChartResize = (0, _useChartResize2.useChartResize)(chartContainer, false, 170, 940),
height = _useChartResize.height,
width = _useChartResize.width;
diff --git a/5/ecolyo.e032256c323f91a65e66.js b/5/ecolyo.72a7eabe03dee9217ec1.js
similarity index 99%
rename from 5/ecolyo.e032256c323f91a65e66.js
rename to 5/ecolyo.72a7eabe03dee9217ec1.js
index 1d058495f..b04e510c3 100644
--- a/5/ecolyo.e032256c323f91a65e66.js
+++ b/5/ecolyo.72a7eabe03dee9217ec1.js
@@ -4950,7 +4950,8 @@ var FluidChartSwipe = function FluidChartSwipe(_ref) {
}),
currentIndex = _useSelector.currentIndex,
currentTimeStep = _useSelector.currentTimeStep,
- selectedDate = _useSelector.selectedDate;
+ selectedDate = _useSelector.selectedDate,
+ loading = _useSelector.loading;
var swipe = (0, _react.useRef)(null);
@@ -4975,7 +4976,7 @@ var FluidChartSwipe = function FluidChartSwipe(_ref) {
dispatch((0, _chart.setCurrentIndex)(updatedIndex));
};
- var _useChartResize = (0, _useChartResize2.useChartResize)(swipe),
+ var _useChartResize = (0, _useChartResize2.useChartResize)(swipe, loading),
height = _useChartResize.height,
width = _useChartResize.width;
diff --git a/app/ecolyo.0a3b91f6b431f1403ad4.js b/app/ecolyo.81e10ab634b9f0913fac.js
similarity index 99%
rename from app/ecolyo.0a3b91f6b431f1403ad4.js
rename to app/ecolyo.81e10ab634b9f0913fac.js
index 27a65a842..dbdfcca41 100644
--- a/app/ecolyo.0a3b91f6b431f1403ad4.js
+++ b/app/ecolyo.81e10ab634b9f0913fac.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"5c854707901b5b5504d6","4":"f22d2e8508212a56cb53","5":"e032256c323f91a65e66","6":"1540774c38e7b6124ec7","7":"8129fd19ad98c11c5897","8":"a9363dc7eb1de5bcc528","9":"4facae32c2f3722bac49","10":"e8a00fc8bc16cb5a9dfd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"dc7b4fa6e755df72417e","4":"f22d2e8508212a56cb53","5":"72a7eabe03dee9217ec1","6":"1540774c38e7b6124ec7","7":"8129fd19ad98c11c5897","8":"a9363dc7eb1de5bcc528","9":"4facae32c2f3722bac49","10":"e8a00fc8bc16cb5a9dfd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -5680,7 +5680,7 @@ var DuelOngoing = function DuelOngoing(_ref) {
var chartContainer = (0, _react.useRef)(null);
- var _useChartResize = (0, _useChartResize2.useChartResize)(chartContainer),
+ var _useChartResize = (0, _useChartResize2.useChartResize)(chartContainer, false),
height = _useChartResize.height,
width = _useChartResize.width;
@@ -34375,34 +34375,34 @@ var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
var _react = __webpack_require__("q1tI");
/**
- * Update the width and height of the chart when the window is resized
+ * Update the width and height of the chart when the window is resized or the chart is loaded
*/
-var useChartResize = function useChartResize(ref) {
- var _ref$current, _ref$current2;
+var useChartResize = function useChartResize(ref, loading) {
+ var maxHeight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 300;
+ var maxWidth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 940;
- var maxHeight = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 300;
- var maxWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 940;
-
- var _useState = (0, _react.useState)(maxWidth),
+ var _useState = (0, _react.useState)(maxHeight),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
- width = _useState2[0],
- setWidth = _useState2[1];
+ height = _useState2[0],
+ setHeight = _useState2[1];
- var _useState3 = (0, _react.useState)(maxHeight),
+ var _useState3 = (0, _react.useState)(maxWidth),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- height = _useState4[0],
- setHeight = _useState4[1];
+ width = _useState4[0],
+ setWidth = _useState4[1];
(0, _react.useEffect)(function () {
function handleResize() {
- if (ref.current) {
- var chartContainerWidth = ref.current.offsetWidth;
- var chartContainerHeight = ref.current.offsetHeight;
+ if (!loading) {
+ var _ref$current, _ref$current2;
- var _width = Math.min(chartContainerWidth, maxWidth);
+ var chartContainerHeight = ((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetHeight) || maxHeight;
+ var chartContainerWidth = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetWidth) || maxWidth;
var _height = Math.min(chartContainerHeight, maxHeight);
+ var _width = Math.min(chartContainerWidth, maxWidth);
+
setWidth(_width);
setHeight(_height);
}
@@ -34413,7 +34413,7 @@ var useChartResize = function useChartResize(ref) {
return function () {
return window.removeEventListener('resize', handleResize);
};
- }, [maxHeight, maxWidth, ref, (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetHeight, (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetWidth]);
+ }, [loading, maxHeight, maxWidth, ref]);
return {
width: width,
height: height
diff --git a/index.html b/index.html
index d620dc91c..38f1e8949 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.69beab954af56959f24c.js"></script><script src="app/ecolyo.0a3b91f6b431f1403ad4.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.69beab954af56959f24c.js"></script><script src="app/ecolyo.81e10ab634b9f0913fac.js"></script></div></body></html>
\ No newline at end of file
--
GitLab