Merge pull request #544 from City-of-Helsinki/UHF-8070-fix-heading-st…

…yles-with-hds

UHF-8070: fix heading styles with hds

hdbt.theme

@@ -1519,7 +1519,9 @@ function hdbt_preprocess_paragraph__event_list(&$variables) {
       $eventUrl = $linkedEvents->getEventsRequest($params, $settings['field_event_count']);
       $settings['events_api_url'] = $eventUrl;
       $settings['request_url'] = $eventUrl;
-      $settings['places'] = $linkedEvents->getPlaceslist($eventUrl);
+      if ($paragraph->get('field_event_location')->first()->getValue()['value']) {
+        $settings['places'] = $linkedEvents->getPlaceslist($eventUrl);
+      }
     }
 
     $booleanFields = [

src/js/react/apps/linkedevents/components/DateSelect.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { DateInput } from 'hds-react';
 import Collapsible from './Collapsible';
 import { QueryBuilder } from '../utils/QueryBuilder';

src/js/react/apps/linkedevents/containers/SearchContainer.tsx

@@ -4,6 +4,7 @@ import FormContainer from './FormContainer';
 import ResultsContainer from './ResultsContainer';
 import type Event from '../types/Event';
 import { queryBuilderAtom, urlAtom } from '../store';
+import removeHdsNormalizeStyleElementFromDom from '@/react/common/hooks/removeHdsNormalizeStyleElementFromDom';
 
 type ResponseType = {
   data: Event[];
@@ -27,6 +28,8 @@ const SearchContainer = () => {
   const queryBuilder = useAtomValue(queryBuilderAtom);
   const url = useAtomValue(urlAtom) || queryBuilder?.getUrl();
 
+  removeHdsNormalizeStyleElementFromDom();
+
   if (!queryBuilder) {
     return null;
   }

src/js/react/common/hooks/removeHdsNormalizeStyleElementFromDom.tsx

@@ -0,0 +1,14 @@
+import { useLayoutEffect } from 'react';
+
+const removeHdsNormalizeStyleElementFromDom = () => {
+  useLayoutEffect(() => {
+    const styleElements = document.querySelectorAll('style');
+    Object.keys(styleElements).forEach((key: any) => {
+      if (styleElements[key].innerHTML.startsWith('/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */')) {
+        styleElements[key].remove();
+      }
+    });
+  });
+};
+
+export default removeHdsNormalizeStyleElementFromDom;