Merge branch 'release/1.11.0'

OpenWebconcept · May 1, 2024 · f78f9dc · f78f9dc
2 parents 10c4860 + 40d7d14
commit f78f9dc
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+**1.11.0 (2024-05-01)**
+
+- **Let op!** Er zijn diverse aanpassingen doorgevoerd die invloed kunnen hebben op hoe DataInMap wordt weergegeven. Bij een eigen stylesheet moeten mogelijk ook wijzigingen worden doorgevoerd. Lees onderstaande notities goed door!
+- De diverse componenten maakten gebruik van `h1`-koppen. Dit is aangepast naar `h2`, zodat een pagina beperkt kan blijven tot één `h1`-kop.
+- In de vorige versies werd bij het openen van het feature modal een standaard `padding-right` van `17px` op de `body` toegepast (`body.gh-dim-modal-open`) om de ruimte te compenseren voor het verwijderen van de browser scrollbar. Deze waarde kan echter verschillen per scherm en device en wordt daarom nu dynamisch bepaald en wordt direct toegepast op `body.style.paddingRight`.
+
 **1.10.11 (2023-11-28)**
 
 - Nieuwe versies van ondersteunende software bibliotheken in gebruik genomen.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gh-datainmap",
-  "version": "1.10.11",
+  "version": "1.11.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/plugins/gh-datainmap/gh-datainmap.php b/plugins/gh-datainmap/gh-datainmap.php
@@ -3,7 +3,7 @@
 Plugin Name: Data In Map
 Plugin URI: https://github.com/OpenWebconcept/plugin-datainmap
 Description: Data In Map is a plugin for displaying maps.
-Version: 1.10.11
+Version: 1.11.0
 Requires at least: 5.0
 Requires PHP: 7.2
 Author: Gemeente Heerenveen

diff --git a/plugins/gh-datainmap/includes/ajax.php b/plugins/gh-datainmap/includes/ajax.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/menus.php b/plugins/gh-datainmap/includes/menus.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/metaboxes.php b/plugins/gh-datainmap/includes/metaboxes.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/post-type.php b/plugins/gh-datainmap/includes/post-type.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/settings.php b/plugins/gh-datainmap/includes/settings.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/shortcode.php b/plugins/gh-datainmap/includes/shortcode.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/tax-meta-image.php b/plugins/gh-datainmap/includes/tax-meta-image.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/taxonomy.php b/plugins/gh-datainmap/includes/taxonomy.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/plugins/gh-datainmap/includes/utils.php b/plugins/gh-datainmap/includes/utils.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/actions.js b/src/actions.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/admin-layers.js b/src/admin-layers.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/admin-location.js b/src/admin-location.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/admin-locationpicker.js b/src/admin-locationpicker.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/components/feature.js b/src/components/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -14,6 +14,7 @@
 import React, {Component} from 'react';
 import {CSSTransition} from 'react-transition-group';
 import _ from 'lodash';
+import { getScrollbarWidth } from '../util/browser';
 import { FEATURE_TYPE_WMSFEATURE, FEATURE_TYPE_KMLFEATURE, FEATURE_TYPE_DIMFEATURE, FEATURE_TYPE_UNKNOWN } from '../constants';
 
 function CloseModal({ onClick }) {
@@ -39,7 +40,7 @@ class KMLFeatureComponent extends Component {
         return (
             <>
                 <header>
-                    <h1>{feature.name}</h1>
+                    <h2>{feature.name}</h2>
                     <CloseModal onClick={() => this.props.closeModal()} />
                 </header>
                 <section className="gh-dim-feature-content" dangerouslySetInnerHTML={{__html: feature.description}} tabIndex="0" />
@@ -58,7 +59,7 @@ class WMSFeatureComponent extends Component {
         return (
             <>
                 <header>
-                    <h1>Informatie</h1>
+                    <h2>Informatie</h2>
                     <CloseModal onClick={() => this.props.closeModal()} />
                 </header>
                 <section className="gh-dim-feature-content" dangerouslySetInnerHTML={{__html: feature}} tabIndex="0" />
@@ -83,7 +84,7 @@ class DIMFeatureComponent extends Component {
         return (
             <>
                 <header>
-                    <h1 dangerouslySetInnerHTML={{__html: title}}></h1>
+                    <h2 dangerouslySetInnerHTML={{__html: title}}></h2>
                     <CloseModal onClick={() => this.props.closeModal()} />
                 </header>
                 <section className="gh-dim-feature-content" dangerouslySetInnerHTML={{__html: feature.content}} tabIndex="0" />
@@ -135,13 +136,15 @@ export default class FeatureComponent extends Component {
     componentDidUpdate(prevProps) {
         if(this.props.feature !== null) {
             document.body.classList.add('gh-dim-modal-open');
+            document.body.style.paddingRight = getScrollbarWidth() + 'px';
             if(typeof this.props.cb === 'function') {
                 this.refModal.current.focus();
                 this.props.cb(this.props.feature);
             }
         }
         else {
             document.body.classList.remove('gh-dim-modal-open');
+            document.body.style.paddingRight = null;
         }
 
         // Close modal when Escape is pressed

diff --git a/src/components/featureslistbox.js b/src/components/featureslistbox.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -136,7 +136,7 @@ class FeaturesListboxComponent extends Component {
             <div className="gh-dim-features-listbox" tabIndex="0" onKeyDown={(e) => this.keyboardNavigation(e)} onBlur={(e) => this.setState({currentResult: null})}>
                 <section aria-labelledby={this.headerId}>
                     <header>
-                        <h1 id={this.headerId}>Gevonden locaties <span>({totalResults > 100 ? '100+' : totalResults})</span></h1>
+                        <h2 id={this.headerId}>Gevonden locaties <span>({totalResults > 100 ? '100+' : totalResults})</span></h2>
                     </header>
                     <div className="gh-dim-features-listbox-content" ref={this.listboxContainer}>
                         <ul aria-live="polite" role="listbox" aria-label="Locaties zichtbaar op de kaart" aria-activedescendant={activeDescendant} aria-expanded={expanded}>

diff --git a/src/components/filter.js b/src/components/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -56,7 +56,7 @@ export class FilterComponent extends Component {
             <div className="gh-dim-filter" tabIndex="0" onKeyDown={blur}>
                 <section aria-labelledby={id}>
                     <header>
-                        <h1 id={id}>Filters</h1>
+                        <h2 id={id}>Filters</h2>
                     </header>
                     <div className="gh-dim-filters">
                         {this.props.description &&

diff --git a/src/components/map.js b/src/components/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/components/search.js b/src/components/search.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/components/toggler.js b/src/components/toggler.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.
@@ -73,7 +73,7 @@ export class TogglerComponent extends Component {
             <div className="gh-dim-toggler" tabIndex="0" onKeyDown={blur}>
                 <section aria-labelledby={id}>
                     <header>
-                        <h1 id={id}>Lagen</h1>
+                        <h2 id={id}>Lagen</h2>
                     </header>
                     <div className="gh-dim-togglers">
                         {this.props.description &&

diff --git a/src/containers/featurelink.js b/src/containers/featurelink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/containers/filterlink.js b/src/containers/filterlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/containers/maplink.js b/src/containers/maplink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/containers/searchlink.js b/src/containers/searchlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/containers/togglerlink.js b/src/containers/togglerlink.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/datainmap.js b/src/datainmap.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/reducers/feature.js b/src/reducers/feature.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/reducers/filter.js b/src/reducers/filter.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/reducers/map.js b/src/reducers/map.js
@@ -1,5 +1,5 @@
 /*
-* Copyright 2020-2023 Gemeente Heerenveen
+* Copyright 2020-2024 Gemeente Heerenveen
 *
 * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use this work except in compliance with the Licence.

diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -85,7 +85,7 @@ $shadow-color: rgba(0, 0, 0, 0.5);
             }
         }
 
-        header h1 {
+        header h2 {
             background-color:$bgcolor-button-hover;
             text-align:left;
         }
@@ -94,7 +94,7 @@ $shadow-color: rgba(0, 0, 0, 0.5);
     header {
         margin:0 -20px;
         background-color:$bgcolor-button-neutral;
-        h1 {
+        h2 {
             @include font-size(14px);
             margin:0;
             padding:10px;
@@ -355,15 +355,15 @@ $shadow-color: rgba(0, 0, 0, 0.5);
                 }
             }
 
-            header h1 {
+            header h2 {
                 background-color:$bgcolor-button-hover;
             }
         }
 
         header {
             margin:0 -20px;
             background-color:$bgcolor-button-neutral;
-            h1 {
+            h2 {
                 @include font-size(14px);
                 margin:0;
                 padding:10px;
@@ -427,7 +427,6 @@ $shadow-color: rgba(0, 0, 0, 0.5);
 
 body.gh-dim-modal-open {
     overflow:hidden;
-    padding-right:17px;
 }
 
 .gh-dim-feature-modal {
@@ -462,7 +461,7 @@ body.gh-dim-modal-open {
             padding:10px 0px 15px 15px;
             background-color:$bgcolor-feature-header;
             border-radius:6px 6px 0 0;
-            h1 {
+            h2 {
                 @include font-size(24px);
                 margin:0;
                 color:#FFF;