@eeacms/volto-cca-policy 0.2.26 → 0.2.28

package/src/components/manage/Blocks/RASTBlock/styles.less

@@ -12,10 +12,10 @@
     pointer-events: all !important;
   }
 
-  svg,
-  svg * {
-    pointer-events: none;
-  }
+  // svg,
+  // svg * {
+  //   pointer-events: none;
+  // }
 
   .link-active {
     .circle,
@@ -37,4 +37,5 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  margin-bottom: 2em;
 }

package/src/helpers/country_map/countryMap.js

@@ -69,43 +69,6 @@ export function removeTooltip() {
   }
 }
 
-// export const withCountriesData = (WrappedComponent) => {
-//   function WithCountriesDataWrapped(props) {
-//     let [cpath, setCpath] = React.useState();
-//
-//     useEffect(() => {
-//       if (!cpath) {
-//         import('./euro-countries-simplified.js').then((mod) => {
-//           const _cpath = mod.default;
-//           _cpath.features = _cpath.features.map(function (c) {
-//             //console.log(c);
-//             var name = c.properties.SHRT_ENGL;
-//             if (!name) {
-//               // console.log('No flag for', c.properties);
-//               return c;
-//             } else if (name === 'Czechia') {
-//               name = 'Czech Republic';
-//             }
-//             var cname = name.replace(' ', '_');
-//             flags.forEach(function (f) {
-//               if (f.indexOf(cname) > -1) {
-//                 c.url = f;
-//                 //console.log(c.url);
-//               }
-//             });
-//             return c;
-//           });
-//
-//           setCpath(_cpath);
-//         });
-//       }
-//     }, [cpath]);
-//
-//     return cpath ? <WrappedComponent {...props} cpath={cpath} /> : null;
-//   }
-//   return WithCountriesDataWrapped;
-// };
-
 export function setTooltipVisibility(node, label, event, visible) {
   if (!node) return;
   if (visible) {
@@ -119,25 +82,28 @@ export function setTooltipVisibility(node, label, event, visible) {
   }
 }
 
-export const getClosestFeatureToCoordinate = (coordinate, features) => {
+export const getClosestFeatureToCoordinate = (coordinate, features, ol) => {
   if (!features.length) return null;
   const x = coordinate[0];
   const y = coordinate[1];
   let closestFeature = null;
-  const closestPoint = [NaN, NaN];
-  let minSquaredDistance = Infinity;
 
   features.forEach((feature) => {
     const geometry = feature.getGeometry();
-    const previousMinSquaredDistance = minSquaredDistance;
-    minSquaredDistance = geometry.closestPointXY(
-      x,
-      y,
-      closestPoint,
-      minSquaredDistance,
-    );
-    if (minSquaredDistance < previousMinSquaredDistance) {
-      closestFeature = feature;
+    const type = geometry.getType();
+
+    if (type === 'MultiPolygon') {
+      const polygons = geometry.getPolygons();
+      for (let i = 0; i < polygons.length; i++) {
+        if (polygons[i].containsXY(x, y)) {
+          closestFeature = feature;
+          break;
+        }
+      }
+    } else if (type === 'Polygon') {
+      if (geometry.containsXY(x, y)) {
+        closestFeature = feature;
+      }
     }
   });
 

package/theme/globals/blocks.less

@@ -1,5 +1,7 @@
 .relevant-acecontent-block,
 .search-acecontent-block {
+  margin: 1.7em 0 !important;
+
   .ui.list > .item a,
   .ui.list .list > .item a {
     color: @linkColor;
@@ -18,9 +20,19 @@
     color: @linkColor;
     font-size: 14px;
   }
+
+  &:first-child {
+    margin-top: 0 !important;
+  }
 }
 
 .filter-acecontent-block {
+  margin: 1.5em 0;
+
+  h5 {
+    margin-bottom: 0.3em;
+    margin-top: 1em;
+  }
   .react-select-container {
     width: 230px;
     border: 1px solid #bcbec0;