From 2da4f8868338189689635d8d200997402c2b35c2 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Thu, 29 Jul 2021 16:36:18 +0200 Subject: [PATCH] Fix AW-2617 --- package-lock.json | 53 +++++-------------- package.json | 6 +-- .../fm-map/components/map/map.component.scss | 1 + .../side-panel/side-panel.component.scss | 1 + 4 files changed, 17 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23b404e..8c8b186 100644 --- a/package-lock.json +++ b/package-lock.json @@ -705,7 +705,6 @@ "requires": { "boolbase": "^1.0.0", "css-what": "^4.0.0", - "domhandler": "^4.0.0", "domutils": "^2.4.3", "nth-check": "^2.0.0" } @@ -789,7 +788,6 @@ "dev": true, "requires": { "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", "entities": "^2.0.0" } }, @@ -806,8 +804,7 @@ "dev": true, "requires": { "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" + "domelementtype": "^2.2.0" } }, "enhanced-resolve": { @@ -1920,11 +1917,9 @@ }, "svgo": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz", - "integrity": "sha512-fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q==", + "resolved": "", "dev": true, "requires": { - "@trysound/sax": "0.1.1", "chalk": "^4.1.0", "commander": "^7.1.0", "css-select": "^3.1.2", @@ -4079,25 +4074,25 @@ "dev": true }, "@farmmaps/common": { - "version": "1.1.1-prerelease.2020", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2020.tgz", - "integrity": "sha512-CTY27FyQoA49VJAja3PIpdRkWo2oLSxoFbVdGU3Oz3dPA3KqyMqplsiAfobrqWwsZ4SjA2r25O+92wuqA8aehA==", + "version": "1.1.1-prerelease.2030", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-1.1.1-prerelease.2030.tgz", + "integrity": "sha512-m0QVFx7qWkKHJMIHsGBEYwmOMqa9Ud9D8Wjb/0/+mJE/YQ2mVr++ndQ19PHFHjfPkifnibHovnuajWf27paBXg==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "1.1.1-prerelease.2020", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2020.tgz", - "integrity": "sha512-X2HBpdd4BrYFxo2pkGSK2xFIwSgBVaEzZLAmaoQ44k2loAhCIhp2aWHw88WNGxzVHeUQFToM+1aKza/zTx0VVw==", + "version": "1.1.1-prerelease.2030", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-1.1.1-prerelease.2030.tgz", + "integrity": "sha512-TiaAxN7EAtMdquIiFEY/2XWUDHxDRVCVkjzX8Z0xlwxM5KIy1PFR+TEGa4qnYnRzFX0ZrdZef0Uf6rIKPVAc2g==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "1.1.1-prerelease.2020", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2020.tgz", - "integrity": "sha512-sFw1aHFFlVjuJD6Fddo3PMMyoNXal8n0aDRDQaWXkv+CvM5HME9Fo3QnfjvKhd96fbek93C20gTCUPzUhHBK4g==", + "version": "1.1.1-prerelease.2030", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-1.1.1-prerelease.2030.tgz", + "integrity": "sha512-igMJAeyCs4Vm1FVUSqZHZAztIqUgYY4+Cl5PW6fcUiqVVyQfU50uZYTVPkVhLYxfoJbvP7TSRnPjIqa9yEB8ZQ==", "requires": { "tslib": "^2.0.0" } @@ -4588,12 +4583,6 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, - "@trysound/sax": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz", - "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==", - "dev": true - }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -7186,23 +7175,6 @@ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, - "domhandler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", - "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - }, - "dependencies": { - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true - } - } - }, "domutils": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", @@ -8827,8 +8799,7 @@ }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "resolved": "", "dev": true }, "injection-js": { diff --git a/package.json b/package.json index 2764cfb..4e66aed 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~11.2.14", "@angular/platform-browser-dynamic": "~11.2.14", "@angular/router": "~11.2.14", - "@farmmaps/common": "1.1.1-prerelease.2020", - "@farmmaps/common-map": "1.1.1-prerelease.2020", - "@farmmaps/common-map3d": "1.1.1-prerelease.2020", + "@farmmaps/common": "1.1.1-prerelease.2030", + "@farmmaps/common-map": "1.1.1-prerelease.2030", + "@farmmaps/common-map3d": "1.1.1-prerelease.2030", "@microsoft/signalr": "^3.1.16", "@ng-bootstrap/ng-bootstrap": "^9.0", "@ngrx/effects": "^11.0", diff --git a/projects/common-map/src/fm-map/components/map/map.component.scss b/projects/common-map/src/fm-map/components/map/map.component.scss index 90f387a..6d4579d 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.scss +++ b/projects/common-map/src/fm-map/components/map/map.component.scss @@ -61,6 +61,7 @@ aol-map { position:absolute;width:100%;height:calc(100vh + 4rem);} top:0em; bottom: 7.1em; width: 100%; + pointer-events: none; } .fullscreen .side-panel-container { diff --git a/projects/common/src/fm/components/side-panel/side-panel.component.scss b/projects/common/src/fm/components/side-panel/side-panel.component.scss index 16c57db..b86df63 100644 --- a/projects/common/src/fm/components/side-panel/side-panel.component.scss +++ b/projects/common/src/fm/components/side-panel/side-panel.component.scss @@ -7,6 +7,7 @@ transition: left 0.2s, top 0.2s; background-color: white; box-shadow: 0 0 20px rgba(0, 0, 0, 0.3); + pointer-events: all; } .side-panel.resizing {