Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2627 mobile warning alignment (#4173)

Tom Cariello6cf9b52649fd
diff --git a/.eslintignore b/.eslintignore
index 9f2ac4026..1a0420795 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -13,4 +13,4 @@ test/*
web/build/*
web/dist/*
web/ext/*
-web/js/lib/*
+web/js/lib/*
\ No newline at end of file
diff --git a/.stylelintignore b/.stylelintignore
index aa2ca94b4..447f5257b 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -9,4 +9,5 @@ options/*
reports/*
test/*
!web/css
-web/scss/overrides/*
\ No newline at end of file
+web/scss/overrides/*
+web/scss/lib/*
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f598098b9..b326774ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
"react-portal": "^4.2.1",
"react-redux": "^8.0.5",
"react-resizable": "^1.9.0",
- "react-swipe-to-delete-component": "^0.5.4",
+ "react-swipe-to-delete-component": "1.0.5",
"react-visibility-sensor": "^5.1.1",
"reactstrap": "8.1.x",
"redux": "^4.0.4",
@@ -15276,10 +15276,17 @@
}
},
"node_modules/react-swipe-to-delete-component": {
- "version": "0.5.5",
- "license": "MIT",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/react-swipe-to-delete-component/-/react-swipe-to-delete-component-1.0.5.tgz",
+ "integrity": "sha512-yp91Wl6zjNvJS2MaMo85x3kcu3zjngUGkxz3jMBaWHpzOstfD6Ruvmrv2EWpQfbzrp5YfnTsgXfihxHfZ/UxwA==",
"dependencies": {
- "@babel/runtime": "^7.12.5"
+ "@babel/runtime": "^7.12.5",
+ "prop-types": "^15.8.1",
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
+ },
+ "engines": {
+ "node": "^10.0.0"
},
"peerDependencies": {
"prop-types": "^15.6.0",
@@ -15287,6 +15294,40 @@
"react-dom": "^16.1.1"
}
},
+ "node_modules/react-swipe-to-delete-component/node_modules/react": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+ "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/react-swipe-to-delete-component/node_modules/react-dom": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+ "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "scheduler": "^0.20.2"
+ },
+ "peerDependencies": {
+ "react": "17.0.2"
+ }
+ },
+ "node_modules/react-swipe-to-delete-component/node_modules/scheduler": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+ "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ },
"node_modules/react-test-renderer": {
"version": "16.14.0",
"dev": true,
@@ -28773,9 +28814,44 @@
}
},
"react-swipe-to-delete-component": {
- "version": "0.5.5",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/react-swipe-to-delete-component/-/react-swipe-to-delete-component-1.0.5.tgz",
+ "integrity": "sha512-yp91Wl6zjNvJS2MaMo85x3kcu3zjngUGkxz3jMBaWHpzOstfD6Ruvmrv2EWpQfbzrp5YfnTsgXfihxHfZ/UxwA==",
"requires": {
- "@babel/runtime": "^7.12.5"
+ "@babel/runtime": "^7.12.5",
+ "prop-types": "^15.8.1",
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
+ },
+ "dependencies": {
+ "react": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+ "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+ "requires": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ },
+ "react-dom": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+ "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+ "requires": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "scheduler": "^0.20.2"
+ }
+ },
+ "scheduler": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+ "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+ "requires": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ }
}
},
"react-test-renderer": {
diff --git a/package.json b/package.json
index d0142acb5..cbee5c3f6 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
"react-portal": "^4.2.1",
"react-redux": "^8.0.5",
"react-resizable": "^1.9.0",
- "react-swipe-to-delete-component": "^0.5.4",
+ "react-swipe-to-delete-component": "1.0.5",
"react-visibility-sensor": "^5.1.1",
"reactstrap": "8.1.x",
"redux": "^4.0.4",
diff --git a/web/js/app.js b/web/js/app.js
index 10df1194b..68a4f8e64 100644
--- a/web/js/app.js
+++ b/web/js/app.js
@@ -40,7 +40,6 @@ import 'bootstrap/dist/css/bootstrap.min.css';
import 'ol/ol.css';
import 'rc-slider/dist/rc-slider.min.css';
import 'simplebar/dist/simplebar.min.css';
-import 'react-swipe-to-delete-component/dist/swipe-to-delete.css';
import 'react-image-crop/dist/ReactCrop.css';
import 'react-resizable/css/styles.css';
// App CSS
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index e56def2df..eb676c606 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -1019,21 +1019,3 @@
display: flex;
justify-content: space-between;
}
-
-@media screen and (max-width: $desktop-min-width) and (max-height: $mobile-max-width) and (orientation: landscape),
- (max-width: $mobile-max-width) {
- .instrument-collection {
- h6 {
- margin-right: 20px;
- }
- }
-}
-
-/** React-Swipe-To-Delete Overrides */
-.swipe-to-delete .js-content:first-child {
- position: relative !important;
-}
-
-.layers-all .swipe-to-delete .js-delete {
- margin-top: 5px;
-}
diff --git a/web/scss/index.scss b/web/scss/index.scss
index 7e29278ff..c6d6d824f 100644
--- a/web/scss/index.scss
+++ b/web/scss/index.scss
@@ -47,8 +47,12 @@
@import "features/tour";
@import "features/vectorMeta";
+/* Library Files */
+@import "lib/react-swipe-to-delete";
+
/* Dependency Overrides */
@import "overrides/rc-slider";
@import "overrides/react-joyride";
@import "overrides/react-search-ui";
@import "overrides/react-simplebar";
+@import "overrides/react-swipe-to-delete";
diff --git a/web/scss/lib/react-swipe-to-delete.scss b/web/scss/lib/react-swipe-to-delete.scss
new file mode 100644
index 000000000..0a59e705a
--- /dev/null
+++ b/web/scss/lib/react-swipe-to-delete.scss
@@ -0,0 +1,84 @@
+/*!
+ * React-swipe-to-delete-component v1.0.8
+ * A simple React component implement 'swipe to delete' UI-pattern.
+ * https://github.com/gaer87/react-swipe-to-delete-component
+
+ * Copyright 2022, Fedotov Alexander
+ * Released under the MIT license.
+ */
+.swipe-to-delete {
+ position: relative !important;
+ padding: 0 !important;
+ overflow: hidden !important;
+}
+
+.swipe-to-delete .js-delete {
+ position: absolute !important;
+ top: 0 !important;
+ right: 0 !important;
+ bottom: 0 !important;
+ left: 0 !important;
+ z-index: 1 !important;
+}
+
+/* stylelint-disable property-no-vendor-prefix */
+.swipe-to-delete .js-content {
+ position: relative !important;
+ z-index: 2 !important;
+ -webkit-user-select: none !important;
+ -moz-user-select: none !important;
+ -ms-user-select: none !important;
+}
+/* stylelint-enable property-no-vendor-prefix */
+
+.swipe-to-delete .js-content:first-child {
+ position: relative !important;
+}
+
+.swipe-to-delete .js-transition-delete-right,
+.swipe-to-delete .js-transition-delete-left,
+.swipe-to-delete .js-transition-cancel {
+ transition-property: left !important;
+ transition-duration: 0.5s;
+}
+
+.swipe-to-delete .js-transition-delete-right {
+ left: 100% !important;
+}
+
+.swipe-to-delete .js-transition-delete-left {
+ left: -100% !important;
+}
+
+.swipe-to-delete .js-transition-cancel {
+ left: 0 !important;
+}
+
+.swipe-to-delete .js-delete {
+ background: #ff5f58;
+}
+
+.swipe-to-delete .js-delete svg {
+ position: absolute;
+ left: 17px;
+ top: 50%;
+ margin-top: -13px;
+ width: 25px;
+ height: 25px;
+}
+
+.swipe-to-delete .js-delete svg:first-child {
+ left: auto;
+ right: 17px;
+}
+
+.swipe-to-delete .js-content :first-child {
+ cursor: pointer;
+}
+
+.swipe-to-delete .js-transition-delete-right,
+.swipe-to-delete .js-transition-delete-left,
+.swipe-to-delete .js-transition-cancel {
+ transition-duration: 0.7s;
+ transition-timing-function: ease-in-out;
+}
diff --git a/web/scss/overrides/react-swipe-to-delete.scss b/web/scss/overrides/react-swipe-to-delete.scss
new file mode 100644
index 000000000..bcac12993
--- /dev/null
+++ b/web/scss/overrides/react-swipe-to-delete.scss
@@ -0,0 +1,4 @@
+/** React-Swipe-To-Delete Overrides */
+ .layers-all .swipe-to-delete .js-delete {
+ margin-top: 5px;
+ }