From d4fae75eaff9d4cea44a49f8f7398830abcb0161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 6 Jul 2022 15:41:47 +0200
Subject: [PATCH] update screenfull dependency to 6.0.2 version
refs #500
---
package-lock.json | 16 ++++++++--------
package.json | 2 +-
.../fixedvar-results/results.component.ts | 18 +++++++-----------
.../pb-schema/pb-schema.component.ts | 18 +++++++-----------
4 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4f55fbe45..5e1c16668 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
"primeng": "^14.0.0-rc.1",
"roboto-fontface": "^0.10.0",
"rxjs": "^7.5.5",
- "screenfull": "^5.0.2",
+ "screenfull": "^6.0.2",
"svg-pan-zoom": "^3.6.1",
"tslib": "^2.4.0",
"xlsx": "^0.16.7",
@@ -25067,11 +25067,11 @@
}
},
"node_modules/screenfull": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.0.2.tgz",
- "integrity": "sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-6.0.2.tgz",
+ "integrity": "sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==",
"engines": {
- "node": ">=0.10.0"
+ "node": "^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@@ -47813,9 +47813,9 @@
}
},
"screenfull": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.0.2.tgz",
- "integrity": "sha512-cCF2b+L/mnEiORLN5xSAz6H3t18i2oHh9BA8+CQlAh5DRw2+NFAGQJOSYbcGw8B2k04g/lVvFcfZ83b3ysH5UQ=="
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-6.0.2.tgz",
+ "integrity": "sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw=="
},
"select": {
"version": "1.1.2",
diff --git a/package.json b/package.json
index 82517b36f..c04807b6a 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
"primeng": "^14.0.0-rc.1",
"roboto-fontface": "^0.10.0",
"rxjs": "^7.5.5",
- "screenfull": "^5.0.2",
+ "screenfull": "^6.0.2",
"svg-pan-zoom": "^3.6.1",
"tslib": "^2.4.0",
"xlsx": "^0.16.7",
diff --git a/src/app/components/fixedvar-results/results.component.ts b/src/app/components/fixedvar-results/results.component.ts
index d15bf74a5..ae9747dbe 100644
--- a/src/app/components/fixedvar-results/results.component.ts
+++ b/src/app/components/fixedvar-results/results.component.ts
@@ -1,5 +1,4 @@
-import * as screenfull from "screenfull";
-import { Screenfull } from "screenfull"; // @see https://github.com/sindresorhus/screenfull.js/issues/126#issuecomment-488796645
+import screenfull from "screenfull";
import { NgParameter } from "../../formulaire/elements/ngparam";
import { ServiceFactory } from "../../services/service-factory";
@@ -19,24 +18,21 @@ export class ResultsComponentDirective {
/** tracks the fullscreen state */
public get isFullscreen() {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- return sf.isFullscreen;
+ if (screenfull.isEnabled) {
+ return screenfull.isFullscreen;
}
}
public async setFullscreen(element): Promise<void> {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- await sf.request(element);
+ if (screenfull.isEnabled) {
+ await screenfull.request(element);
this.fullscreenChange(true);
}
}
public async exitFullscreen(): Promise<void> {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- await sf.exit();
+ if (screenfull.isEnabled) {
+ await screenfull.exit();
// this.fullscreenChange(false); // handled by fullScreenHostListener below
}
}
diff --git a/src/app/components/pb-schema/pb-schema.component.ts b/src/app/components/pb-schema/pb-schema.component.ts
index c37219926..5ed050756 100644
--- a/src/app/components/pb-schema/pb-schema.component.ts
+++ b/src/app/components/pb-schema/pb-schema.component.ts
@@ -1,8 +1,7 @@
import { Component, Input, Output, EventEmitter, OnInit, AfterViewInit, ViewChild, Inject, forwardRef, AfterContentInit } from "@angular/core";
import { MatDialog } from "@angular/material/dialog";
-import * as screenfull from "screenfull";
-import { Screenfull } from "screenfull"; // @see https://github.com/sindresorhus/screenfull.js/issues/126#issuecomment-488796645
+import screenfull from "screenfull";
import {
PreBarrage, PbBassin, PbBassinParams, PbCloison, Observer, IObservable, ParamDefinition, ParamValueMode
@@ -81,24 +80,21 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
/** tracks the fullscreen state */
public get isFullscreen() {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- return sf.isFullscreen;
+ if (screenfull.isEnabled) {
+ return screenfull.isFullscreen;
}
}
public async setFullscreen(element): Promise<void> {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- await sf.request(element);
+ if (screenfull.isEnabled) {
+ await screenfull.request(element);
this.fullscreenChange(true);
}
}
public async exitFullscreen(): Promise<void> {
- const sf = <Screenfull>screenfull;
- if (sf.isEnabled) {
- await sf.exit();
+ if (screenfull.isEnabled) {
+ await screenfull.exit();
this.fullscreenChange(false);
}
}
--
GitLab