diff --git a/package.json b/package.json index 98d6cde8..28bc6fdf 100644 --- a/package.json +++ b/package.json @@ -124,14 +124,14 @@ "node": "^10 || ^12" }, "dependencies": { - "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#1.0.1", - "@eeacms/volto-metadata-block": "github:eea/volto-metadata-block#1.0.2", + "@eeacms/volto-blocks-form": "github:eea/volto-blocks-form#1.0.3", + "@eeacms/volto-metadata-block": "github:eea/volto-metadata-block#1.0.4", "@eeacms/volto-object-widget": "github:eea/volto-object-widget#1.0.3", "@eeacms/volto-slate-metadata-mentions": "github:eea/volto-slate-metadata-mentions#1.0.0", "@eeacms/volto-widget-toggle": "github:eea/volto-widget-toggle#1.0.0", "@eeacms/volto-widgets-view": "github:eea/volto-widgets-view#1.0.3", "@material/react-linear-progress": "^0.15.0", - "@plone/volto": "10.4.3", + "@plone/volto": "10.6.1", "axios": "^0.20.0", "jsonp": "^0.2.1", "ol": "^6.4.3", @@ -146,7 +146,7 @@ "react-sizeme": "^2.6.12", "react-tooltip": "^4.2.9", "react-visibility-sensor": "^5.1.1", - "volto-slate": "github:eea/volto-slate#1.0.5" + "volto-slate": "github:eea/volto-slate#1.0.6" }, "devDependencies": { "@babel/cli": "^7.8.4", diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx index 21cd246c..8acba562 100644 --- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx +++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx @@ -68,8 +68,7 @@ let Map, defaultsControls, defaultsInteractions, containsExtent, - VOID, - DragRotateAndZoom; + VOID; let OL_LOADED = false; const OpenlayersMapView = (props) => { @@ -111,6 +110,7 @@ const OpenlayersMapView = (props) => { const firstFilteringDone = useRef(0); const ToggleSidebarControl = useRef(null); const ViewYourAreaControl = useRef(null); + const ExtraControl = useRef(null); const siteTermRef = useRef(null); const mounted = useRef(false); const draggable = !!props.data?.draggable?.value; @@ -175,52 +175,42 @@ const OpenlayersMapView = (props) => { defaultsInteractions = require('ol/interaction.js').defaults; containsExtent = require('ol/extent.js').containsExtent; VOID = require('ol/functions').VOID; - DragRotateAndZoom = require('ol/interaction.js').DragRotateAndZoom; OL_LOADED = true; } - if (OL_LOADED && !ToggleSidebarControl.current && hasSidebar) { - ToggleSidebarControl.current = /*@__PURE__*/ (function (Control) { - function ToggleSidebarControl(opt_options) { - const options = opt_options || {}; - const buttonContainer = document.createElement('div'); - buttonContainer.setAttribute('id', 'map-sidebar-button'); - buttonContainer.setAttribute('class', 'ol-unselectable ol-control'); - Control.call(this, { - element: buttonContainer, - target: options.target, - }); - } - if (Control) ToggleSidebarControl.__proto__ = Control; - ToggleSidebarControl.prototype = Object.create( - Control && Control.prototype, - ); - ToggleSidebarControl.prototype.constructor = ToggleSidebarControl; - return ToggleSidebarControl; - })(Control); - } - - if (OL_LOADED && !ViewYourAreaControl.current) { - ViewYourAreaControl.current = /*@__PURE__*/ (function (Control) { - function ViewYourAreaControl(opt_options) { + if (OL_LOADED && !ExtraControl.current) { + ExtraControl.current = (function (Control) { + function ExtraControl(opt_options) { const options = opt_options || {}; - const buttonContainer = document.createElement('div'); - buttonContainer.setAttribute('id', 'map-view-your-area-button'); - buttonContainer.setAttribute('class', 'ol-unselectable ol-control'); + const buttonsContainer = document.createElement('div'); + const viewYourAreaButton = document.createElement('div'); + const toggleSidebarButton = document.createElement('div'); + buttonsContainer.setAttribute('id', 'extra-control-buttons'); + toggleSidebarButton.setAttribute('id', 'map-sidebar-button'); + toggleSidebarButton.setAttribute( + 'class', + 'ol-unselectable ol-control', + ); + viewYourAreaButton.setAttribute('id', 'map-view-your-area-button'); + viewYourAreaButton.setAttribute( + 'class', + 'ol-unselectable ol-control', + ); + buttonsContainer.appendChild(viewYourAreaButton); + buttonsContainer.appendChild(toggleSidebarButton); Control.call(this, { - element: buttonContainer, + element: buttonsContainer, target: options.target, }); } - if (Control) ViewYourAreaControl.__proto__ = Control; - ViewYourAreaControl.prototype = Object.create( - Control && Control.prototype, - ); - ViewYourAreaControl.prototype.constructor = ViewYourAreaControl; + if (Control) ExtraControl.__proto__ = Control; + ExtraControl.prototype = Object.create(Control && Control.prototype); + ExtraControl.prototype.constructor = ExtraControl; - return ViewYourAreaControl; + return ExtraControl; })(Control); } + if ( canShow(dataprotection.privacy_cookie_key) && document.getElementById('map') @@ -472,15 +462,13 @@ const OpenlayersMapView = (props) => { document.getElementById('map').innerHTML = ''; const map = new Map({ controls: draggable - ? hasSidebar - ? defaultsControls().extend([ - new ToggleSidebarControl.current(), - new ViewYourAreaControl.current(), - ]) - : defaultsControls().extend([new ViewYourAreaControl.current()]) + ? defaultsControls().extend([new ExtraControl.current(hasSidebar)]) : [], interactions: draggable - ? defaultsInteractions().extend([new DragRotateAndZoom()]) + ? defaultsInteractions({ + altShiftDragRotate: false, + pinchRotate: false, + }) : [], target: document.getElementById('map'), view: new View({ diff --git a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/style.css b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/style.css index 4ef68db2..dd26b3cd 100644 --- a/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/style.css +++ b/src/components/manage/Blocks/DiscodataOpenlayersMapBlock/style.css @@ -212,14 +212,21 @@ padding-top: 1rem; } -.ol-overlaycontainer-stopevent #map-sidebar-button { - top: 2.5em; - right: 30px; +.ol-overlaycontainer-stopevent #extra-control-buttons { + position: absolute; + top: .5em; + right: .5em; + padding: 2px; +} + +.ol-overlaycontainer-stopevent #extra-control-buttons .ol-control { + position: relative; + padding: 0; + margin: 1px; } -.ol-overlaycontainer-stopevent #map-view-your-area-button { - top: 0.5em; - right: 30px; +.ol-rotate { + display: none; } @media only screen and (max-width: 600px) { diff --git a/theme/site/elements/container.overrides b/theme/site/elements/container.overrides index 4aaca857..4bd85e30 100644 --- a/theme/site/elements/container.overrides +++ b/theme/site/elements/container.overrides @@ -15,7 +15,7 @@ margin-right 0.3s cubic-bezier(0.6, -0.28, 0.735, 0.045); } -.contentWidthMedia(@width, @headerWidth, @gutter, @offset) { +.contentWidthMedia(@width, @headerWidth, @rowWidth, @gutter, @offset) { .ui.container { width: @width !important; margin-right: @gutter !important; @@ -23,6 +23,10 @@ &.header-container { width: @headerWidth !important; } + &.row { + width: @rowWidth !important; + overflow: auto; + } } .drag.handle.wrapper { @@ -36,7 +40,7 @@ .contentWidth(@offset) { @media only screen and (max-width: @largestMobileScreen + @offset) { - .contentWidthMedia(@mobileWidth, auto, @mobileGutter, -12px); + .contentWidthMedia(auto, auto, 100%, @mobileGutter, -12px); [class*='mobile hidden'], [class*='tablet only']:not(.mobile), @@ -48,7 +52,7 @@ } } @media only screen and (min-width: @tabletBreakpoint + @offset) and (max-width: @largestTabletScreen + @offset) { - .contentWidthMedia(@tabletWidth, @tabletWidth, @tabletGutter, -30px); + .contentWidthMedia(@tabletWidth, @tabletWidth, @tabletWidth, @tabletGutter, -30px); [class*='mobile only']:not(.tablet), [class*='tablet hidden'], @@ -60,7 +64,7 @@ } } @media only screen and (min-width: @computerBreakpoint + @offset) and (max-width: @largestSmallMonitor + @offset) { - .contentWidthMedia(@computerWidth, @computerWidth, @computerGutter, -30px); + .contentWidthMedia(@computerWidth, @computerWidth, @computerWidth, @computerGutter, -30px); [class*='mobile only']:not(.computer), [class*='tablet only']:not(.computer), @@ -72,7 +76,7 @@ } } @media only screen and (min-width: @largeMonitorBreakpoint + @offset) { - .contentWidthMedia(@largeMonitorWidth, @largeMonitorWidth, @largeMonitorGutter, -30px); + .contentWidthMedia(@largeMonitorWidth, @largeMonitorWidth, @largeMonitorWidth, @largeMonitorGutter, -30px); [class*='mobile only']:not([class*='large screen']), [class*='tablet only']:not([class*='large screen']), diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides index 09b6bd46..6c46231b 100644 --- a/theme/site/globals/site.overrides +++ b/theme/site/globals/site.overrides @@ -5,7 +5,7 @@ width: 80% !important; @media only screen and (max-width: @largestTabletScreen) { - margin: 0 2rem !important; + margin: 0 1rem !important; width: auto !important; } } @@ -240,13 +240,19 @@ h4 { p { color: @bodyColor; - font-weight: @lightWeight; + font-weight: 300; &.documentDescription { color: @fullBlack; } } +ul, ol { + li { + font-weight: 300; + } +} + .breadcrumbs { display: none; } diff --git a/yarn.lock b/yarn.lock index 343d64e0..9f2e5fd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1281,13 +1281,21 @@ dependencies: "@datapunt/matomo-tracker-js" "^0.3.1" -"@eeacms/volto-blocks-form@^1.0.0", "@eeacms/volto-blocks-form@github:eea/volto-blocks-form#1.0.1": +"@eeacms/volto-blocks-form@^1.0.0": version "1.0.1" resolved "https://codeload.github.com/eea/volto-blocks-form/tar.gz/d0b03343475267aede2933316b579f28bad1c0e7" -"@eeacms/volto-metadata-block@github:eea/volto-metadata-block#1.0.2": - version "1.0.2" - resolved "https://codeload.github.com/eea/volto-metadata-block/tar.gz/29ddef80e894c36db0e0ae20e6b42f5024c5f8d4" +"@eeacms/volto-blocks-form@github:eea/volto-blocks-form#1.0.3": + version "1.0.3" + resolved "https://codeload.github.com/eea/volto-blocks-form/tar.gz/78d8fd37b1548c26a921fc2059a67339ca059fa3" + dependencies: + react-beautiful-dnd "13.0.0" + +"@eeacms/volto-metadata-block@github:eea/volto-metadata-block#1.0.4": + version "1.0.4" + resolved "https://codeload.github.com/eea/volto-metadata-block/tar.gz/762d57b4e7debd2a65a4ce8ed3ff17734b607b01" + dependencies: + "@eeacms/volto-widgets-view" "^1.0.3" "@eeacms/volto-object-widget@^1.0.0", "@eeacms/volto-object-widget@github:eea/volto-object-widget#1.0.3": version "1.0.3" @@ -1306,7 +1314,12 @@ version "1.0.0" resolved "https://codeload.github.com/eea/volto-widget-toggle/tar.gz/9298d3d68642670c7b16e31ede0c9299e84c8b65" -"@eeacms/volto-widgets-view@^1.0.0", "@eeacms/volto-widgets-view@github:eea/volto-widgets-view#1.0.3": +"@eeacms/volto-widgets-view@^1.0.0", "@eeacms/volto-widgets-view@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@eeacms/volto-widgets-view/-/volto-widgets-view-1.0.3.tgz#6c2385c39bccc613152332c181f17633fb0dbd72" + integrity sha512-vrIg7Sox0ZXu8xwRdjAlIoPAadXddpGCUaOPr4L8XuR6dW+qFi5efxqgecKNJUuvswpB0MW+i+4b2KFb8PXcSw== + +"@eeacms/volto-widgets-view@github:eea/volto-widgets-view#1.0.3": version "1.0.3" resolved "https://codeload.github.com/eea/volto-widgets-view/tar.gz/3afd126992b28e91d1ba5e559ffa5f4cb6959584" @@ -1899,10 +1912,10 @@ dependencies: "@types/node" ">= 8" -"@plone/volto@10.4.3": - version "10.4.3" - resolved "https://registry.yarnpkg.com/@plone/volto/-/volto-10.4.3.tgz#34a50f5bfff584734e4437e2b8f1da76e7cecec6" - integrity sha512-ICjETgM2lgRZq/NzwFE/lD1y9nPri/u/rBEPRhpdSZmM4N8ljRrJUMeIfBjvckWHhK8UUbKGGcXKncQKEPqTDw== +"@plone/volto@10.6.1": + version "10.6.1" + resolved "https://registry.yarnpkg.com/@plone/volto/-/volto-10.6.1.tgz#0af580287086c924bce9a093470c34b59a9f4a4b" + integrity sha512-hiIW6gQLzRhNflpaTX3jJrQTlkwQGMNFtB8I7vXfMMKiwXgz9y6IEzJ6LnUVECmCYM3EW9PLzX9gLcwDRcaVRg== dependencies: "@babel/plugin-proposal-export-default-from" "7.10.4" "@babel/plugin-proposal-export-namespace-from" "7.10.4" @@ -2196,11 +2209,6 @@ dependencies: "@sentry/cli" "^1.55.0" -"@sheerun/mutationobserver-shim@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25" - integrity sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw== - "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -2257,7 +2265,7 @@ dependencies: defer-to-connect "^2.0.0" -"@testing-library/dom@*", "@testing-library/dom@^7.28.1": +"@testing-library/dom@^7.28.1": version "7.29.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.29.0.tgz#60b18065bab50a5cde21fe80275a47a43024d9cc" integrity sha512-0hhuJSmw/zLc6ewR9cVm84TehuTd7tbqBX9pRNSp8znJ9gTmSgesdbiGZtt8R6dL+2rgaPFp9Yjr7IU1HWm49w== @@ -2271,19 +2279,6 @@ lz-string "^1.4.4" pretty-format "^26.6.2" -"@testing-library/dom@^6.15.0": - version "6.16.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-6.16.0.tgz#04ada27ed74ad4c0f0d984a1245bb29b1fd90ba9" - integrity sha512-lBD88ssxqEfz0wFL6MeUyyWZfV/2cjEZZV3YRpb2IoJRej/4f1jB0TzqIOznTpfR1r34CNesrubxwIlAQ8zgPA== - dependencies: - "@babel/runtime" "^7.8.4" - "@sheerun/mutationobserver-shim" "^0.3.2" - "@types/testing-library__dom" "^6.12.1" - aria-query "^4.0.2" - dom-accessibility-api "^0.3.0" - pretty-format "^25.1.0" - wait-for-expect "^3.0.2" - "@testing-library/jest-dom@4.2.4": version "4.2.4" resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-4.2.4.tgz#00dfa0cbdd837d9a3c2a7f3f0a248ea6e7b89742" @@ -2307,15 +2302,6 @@ "@babel/runtime" "^7.12.5" "@testing-library/dom" "^7.28.1" -"@testing-library/react@9.5.0": - version "9.5.0" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-9.5.0.tgz#71531655a7890b61e77a1b39452fbedf0472ca5e" - integrity sha512-di1b+D0p+rfeboHO5W7gTVeZDIK5+maEgstrZbWZSSvxDyfDRkkyBE1AJR5Psd6doNldluXlCWqXriUfqu/9Qg== - dependencies: - "@babel/runtime" "^7.8.4" - "@testing-library/dom" "^6.15.0" - "@types/testing-library__react" "^9.1.2" - "@types/anymatch@*": version "1.3.1" resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" @@ -2509,13 +2495,6 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@*": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" - integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== - dependencies: - "@types/react" "*" - "@types/react@*": version "16.9.46" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.46.tgz#f0326cd7adceda74148baa9bff6e918632f5069e" @@ -2561,29 +2540,6 @@ resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== -"@types/testing-library__dom@*": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-7.5.0.tgz#e0a00dd766983b1d6e9d10d33e708005ce6ad13e" - integrity sha512-mj1aH4cj3XUpMEgVpognma5kHVtbm6U6cHZmEFzCRiXPvKkuHrFr3+yXdGLXvfFRBaQIVshPGHI+hGTOJlhS/g== - dependencies: - "@testing-library/dom" "*" - -"@types/testing-library__dom@^6.12.1": - version "6.14.0" - resolved "https://registry.yarnpkg.com/@types/testing-library__dom/-/testing-library__dom-6.14.0.tgz#1aede831cb4ed4a398448df5a2c54b54a365644e" - integrity sha512-sMl7OSv0AvMOqn1UJ6j1unPMIHRXen0Ita1ujnMX912rrOcawe4f7wu0Zt9GIQhBhJvH2BaibqFgQ3lP+Pj2hA== - dependencies: - pretty-format "^24.3.0" - -"@types/testing-library__react@^9.1.2": - version "9.1.3" - resolved "https://registry.yarnpkg.com/@types/testing-library__react/-/testing-library__react-9.1.3.tgz#35eca61cc6ea923543796f16034882a1603d7302" - integrity sha512-iCdNPKU3IsYwRK9JieSYAiX0+aYDXOGAmrC/3/M7AqqSDKnWWVv07X+Zk1uFSL7cMTUYzv4lQRfohucEocn5/w== - dependencies: - "@types/react-dom" "*" - "@types/testing-library__dom" "*" - pretty-format "^25.1.0" - "@types/uglify-js@*": version "3.9.3" resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.9.3.tgz#d94ed608e295bc5424c9600e6b8565407b6b4b6b" @@ -3062,7 +3018,7 @@ aria-query@^3.0.0: ast-types-flow "0.0.7" commander "^2.11.0" -aria-query@^4.0.2, aria-query@^4.2.2: +aria-query@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== @@ -5922,11 +5878,6 @@ document.contains@^1.0.1: dependencies: define-properties "^1.1.3" -dom-accessibility-api@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz#511e5993dd673b97c87ea47dba0e3892f7e0c983" - integrity sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA== - dom-accessibility-api@^0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz#b06d059cdd4a4ad9a79275f9d414a5c126241166" @@ -13089,7 +13040,7 @@ pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0: +pretty-format@^24.0.0, pretty-format@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== @@ -13099,7 +13050,7 @@ pretty-format@^24.0.0, pretty-format@^24.3.0, pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-format@^25.1.0, pretty-format@^25.2.1, pretty-format@^25.5.0: +pretty-format@^25.2.1, pretty-format@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== @@ -17116,13 +17067,11 @@ volto-slate@^1.0.0: slate-react "^0.59" weak-key "^1.0.2" -"volto-slate@github:eea/volto-slate#1.0.5": - version "1.0.5" - resolved "https://codeload.github.com/eea/volto-slate/tar.gz/8ca68d4582860d951b4200dc22a8e35858cd6591" +"volto-slate@github:eea/volto-slate#1.0.6": + version "1.0.6" + resolved "https://codeload.github.com/eea/volto-slate/tar.gz/1a22eae5f7d488b0a04f414940a6459a10a9920f" dependencies: "@eeacms/volto-object-widget" "^1.0.0" - "@testing-library/react" "9.5.0" - "@types/jest" "^25.2.3" classnames "2.2.6" image-extensions "1.1.0" is-url "1.2.4" @@ -17149,11 +17098,6 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-for-expect@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/wait-for-expect/-/wait-for-expect-3.0.2.tgz#d2f14b2f7b778c9b82144109c8fa89ceaadaa463" - integrity sha512-cfS1+DZxuav1aBYbaO/kE06EOS8yRw7qOFoD3XtjTkYvCvh3zUvNST8DXK/nPaeqIzIv3P3kL3lRJn8iwOiSag== - wait-on@3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-3.3.0.tgz#9940981d047a72a9544a97b8b5fca45b2170a082"