From f2c2fcb4c545650bed5e1f0863589d775be93660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Mon, 20 Apr 2020 19:33:11 +0200
Subject: [PATCH 01/21] Fix dependencies

---
 package-lock.json | 8 +++-----
 package.json      | 8 +++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad91276..ca56e45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebenan-form",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8995,14 +8995,12 @@
     "nebenan-helpers": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.1.1.tgz",
-      "integrity": "sha512-EMsskZXressFiOU4uwdMrFkINo1G18QbWvQFrkynbpXw0+FJOyZoRtAfife6d6kX8geiR/+f4S2vo+SluQ3enw==",
-      "dev": true
+      "integrity": "sha512-EMsskZXressFiOU4uwdMrFkINo1G18QbWvQFrkynbpXw0+FJOyZoRtAfife6d6kX8geiR/+f4S2vo+SluQ3enw=="
     },
     "nebenan-react-datepicker": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/nebenan-react-datepicker/-/nebenan-react-datepicker-1.0.0.tgz",
-      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q==",
-      "dev": true
+      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q=="
     },
     "nebenan-ui-kit": {
       "version": "4.6.0",
diff --git a/package.json b/package.json
index c45b33c..d0bf81b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",
@@ -64,9 +64,7 @@
     "lodash": "^4.17.15",
     "mocha": "^7.1.1",
     "morgan": "^1.10.0",
-    "nebenan-helpers": "^4.1.1",
     "nebenan-ui-kit": "^4.4.1",
-    "nebenan-react-datepicker": "^1.0.0",
     "node-sass-glob-importer": "^5.3.2",
     "nodemon": "^2.0.1",
     "normalize.css": "^8.0.1",
@@ -87,6 +85,10 @@
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },
+  "dependencies": {
+    "nebenan-react-datepicker": "^1.0.0",
+    "nebenan-helpers": "^4.1.1"
+  },
   "peerDependencies": {
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",

From 95a0cf70e4498ec7361afc0051c432b579737bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 08:56:20 +0200
Subject: [PATCH 02/21] Migrate dependencies to peerDependencies

---
 package.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d0bf81b..2486dc0 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1",
+  "version": "8.3.1-beta.0",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",
@@ -85,13 +85,11 @@
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },
-  "dependencies": {
-    "nebenan-react-datepicker": "^1.0.0",
-    "nebenan-helpers": "^4.1.1"
-  },
   "peerDependencies": {
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",
+    "nebenan-react-datepicker": "^1.0.0",
+    "nebenan-helpers": "^4.1.1",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",

From 4ad61824f76c95e4722182fd4a7f3b9c71ad5f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 08:57:25 +0200
Subject: [PATCH 03/21] Forgot to add package lockfile

---
 package-lock.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ca56e45..26ca04a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebenan-form",
-  "version": "8.3.1",
+  "version": "8.3.1-beta.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8992,16 +8992,6 @@
         }
       }
     },
-    "nebenan-helpers": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.1.1.tgz",
-      "integrity": "sha512-EMsskZXressFiOU4uwdMrFkINo1G18QbWvQFrkynbpXw0+FJOyZoRtAfife6d6kX8geiR/+f4S2vo+SluQ3enw=="
-    },
-    "nebenan-react-datepicker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nebenan-react-datepicker/-/nebenan-react-datepicker-1.0.0.tgz",
-      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q=="
-    },
     "nebenan-ui-kit": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/nebenan-ui-kit/-/nebenan-ui-kit-4.6.0.tgz",

From 56ae9b07a9b19adb90eeb6ef5d755e28fec0f979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 09:02:30 +0200
Subject: [PATCH 04/21] Add new peerDependencies to devDependencies

---
 package-lock.json | 12 ++++++++++++
 package.json      |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 26ca04a..4f710eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8992,6 +8992,18 @@
         }
       }
     },
+    "nebenan-helpers": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.1.1.tgz",
+      "integrity": "sha512-EMsskZXressFiOU4uwdMrFkINo1G18QbWvQFrkynbpXw0+FJOyZoRtAfife6d6kX8geiR/+f4S2vo+SluQ3enw==",
+      "dev": true
+    },
+    "nebenan-react-datepicker": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nebenan-react-datepicker/-/nebenan-react-datepicker-1.0.0.tgz",
+      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q==",
+      "dev": true
+    },
     "nebenan-ui-kit": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/nebenan-ui-kit/-/nebenan-ui-kit-4.6.0.tgz",
diff --git a/package.json b/package.json
index 2486dc0..6a41c76 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,8 @@
     "stylelint": "^13.2.1",
     "stylelint-config-nebenan": "^1.6.0",
     "terser": "^4.6.7",
+    "nebenan-react-datepicker": "^1.0.0",
+    "nebenan-helpers": "^4.1.1",
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },

From 184f23b952126567642c7bcbdd110b5a9820636f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 09:27:11 +0200
Subject: [PATCH 05/21] Change root stylesheet imports to match imports in
 nebenan-frontend

---
 index.scss                | 2 +-
 src/datepicker/index.scss | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/index.scss b/index.scss
index 6f47382..c62eb66 100644
--- a/index.scss
+++ b/index.scss
@@ -1,2 +1,2 @@
 @import 'nebenan-ui-kit/_index.scss';
-@import 'src/**/*.scss';
+@import 'src/**/index.scss';
diff --git a/src/datepicker/index.scss b/src/datepicker/index.scss
index 88aae85..936ff41 100644
--- a/src/datepicker/index.scss
+++ b/src/datepicker/index.scss
@@ -1,3 +1,5 @@
+@import 'theme.scss';
+
 .c-datepicker {
   position: relative;
 }

From ca2cac97441c38744e6d704dc51c4fee436f57f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 09:28:00 +0200
Subject: [PATCH 06/21] Raise beta version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a41c76..e830a1b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.0",
+  "version": "8.3.1-beta.1",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",

From 9c15c4b8f573d427ead26b29a159396a22575188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 09:53:22 +0200
Subject: [PATCH 07/21] Change src import to match imports in nebenan-frontend

---
 preview/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preview/index.scss b/preview/index.scss
index df95f5f..36c2ff6 100644
--- a/preview/index.scss
+++ b/preview/index.scss
@@ -1,5 +1,5 @@
 @import 'nebenan-ui-kit/styles';
-@import '../src/**/*.scss';
+@import '../src/**/index.scss';
 @import './components/**/*.scss';
 @import './containers/**/*.scss';
 

From 04826f2515b057d80c89f6a1277afcec73d868eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 10:18:17 +0200
Subject: [PATCH 08/21] Fix event handling to prevent opening of picker after
 clear

---
 package.json            | 2 +-
 src/datepicker/index.es | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e830a1b..0430e3d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.1",
+  "version": "8.3.1-beta.2",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",
diff --git a/src/datepicker/index.es b/src/datepicker/index.es
index 26423c0..24e658f 100644
--- a/src/datepicker/index.es
+++ b/src/datepicker/index.es
@@ -97,7 +97,8 @@ class Datepicker extends InputComponent {
     else this.hide();
   }
 
-  handleClear() {
+  handleClear(event) {
+    event.preventDefault();
     this.setValue(null, this.validate);
   }
 
@@ -153,10 +154,11 @@ class Datepicker extends InputComponent {
 
     return (
       <div ref={this.setEl('container')} className={className}>
-        <label onClick={this.handleClick}>
+        <label>
           {labelNode}
           <div className="c-datepicker-container">
             <input
+              onClick={this.handleClick}
               ref={this.setEl('input')}
               className={inputClassName}
               placeholder={placeholder}

From ac11085ac88980acef2b71a2f4fda1542dbb3934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 16:26:52 +0200
Subject: [PATCH 09/21] Move nebenan-react-datepicker to dependencies

---
 package-lock.json | 5 ++---
 package.json      | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f710eb..b8a41fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebenan-form",
-  "version": "8.3.1-beta.0",
+  "version": "8.3.1-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -9001,8 +9001,7 @@
     "nebenan-react-datepicker": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/nebenan-react-datepicker/-/nebenan-react-datepicker-1.0.0.tgz",
-      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q==",
-      "dev": true
+      "integrity": "sha512-7lAPb/6g3ygDc4+IfEd/E8i5PotiO/dvYm0mK0XxDGETZ1Rmyt0brC1ymiWkvhU9qGUXlr2yVdi0UT/NRoKA3Q=="
     },
     "nebenan-ui-kit": {
       "version": "4.6.0",
diff --git a/package.json b/package.json
index 0430e3d..0028902 100644
--- a/package.json
+++ b/package.json
@@ -87,10 +87,12 @@
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },
+  "dependencies": {
+    "nebenan-react-datepicker": "^1.0.0"
+  },
   "peerDependencies": {
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",
-    "nebenan-react-datepicker": "^1.0.0",
     "nebenan-helpers": "^4.1.1",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",

From e40cd5a790f0d3ec809f0d63e98e3795bf08d7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 16:28:00 +0200
Subject: [PATCH 10/21] Bump beta version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0028902..5fde45d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.2",
+  "version": "8.3.1-beta.3",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",

From 40cd693fa58400ec2b5ff588ffea6fd5ca133cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 19:38:52 +0200
Subject: [PATCH 11/21] Add theme support for datepicker

---
 .../{theme.es => calendar_theme.es}           |  0
 .../{theme.scss => calendar_theme.scss}       |  0
 src/datepicker/index.es                       | 10 ++--
 src/datepicker/index.scss                     |  2 +-
 src/datepicker/utils.es                       | 30 ++++++++++++
 test/datepicker/utils.js                      | 48 +++++++++++++++++++
 6 files changed, 86 insertions(+), 4 deletions(-)
 rename src/datepicker/{theme.es => calendar_theme.es} (100%)
 rename src/datepicker/{theme.scss => calendar_theme.scss} (100%)

diff --git a/src/datepicker/theme.es b/src/datepicker/calendar_theme.es
similarity index 100%
rename from src/datepicker/theme.es
rename to src/datepicker/calendar_theme.es
diff --git a/src/datepicker/theme.scss b/src/datepicker/calendar_theme.scss
similarity index 100%
rename from src/datepicker/theme.scss
rename to src/datepicker/calendar_theme.scss
diff --git a/src/datepicker/index.es b/src/datepicker/index.es
index 24e658f..886364c 100644
--- a/src/datepicker/index.es
+++ b/src/datepicker/index.es
@@ -10,8 +10,8 @@ import Picker from 'nebenan-react-datepicker/lib';
 import { bindTo } from '../utils';
 
 import InputComponent from '../base';
-import theme from './theme';
-import { getDate, getValueFromDate, getValueFromISO } from './utils';
+import calendarTheme from './calendar_theme';
+import { getDate, getSubTheme, getValueFromDate, getValueFromISO, mergeThemes } from './utils';
 
 class Datepicker extends InputComponent {
   constructor(props) {
@@ -120,6 +120,7 @@ class Datepicker extends InputComponent {
       firstDay,
       weekdayShortLabels,
       monthLabels,
+      theme: passedTheme,
     } = this.props;
 
     const localizedValue = getValueFromISO(value, dateFormat);
@@ -140,7 +141,8 @@ class Datepicker extends InputComponent {
           selected={getDate(value)}
           minDate={getDate(minDate)}
           maxDate={getDate(maxDate)}
-          {...{ theme, monthLabels, weekdayShortLabels, firstDay }}
+          theme={mergeThemes(calendarTheme, getSubTheme(passedTheme, 'calendar'))}
+          {...{ monthLabels, weekdayShortLabels, firstDay }}
         />
       );
     }
@@ -179,6 +181,8 @@ class Datepicker extends InputComponent {
 Datepicker.propTypes = {
   ...InputComponent.propTypes,
 
+  theme: PropTypes.object,
+
   firstDay: PropTypes.number.isRequired,
   weekdayShortLabels: PropTypes.arrayOf(PropTypes.string).isRequired,
   monthLabels: PropTypes.arrayOf(PropTypes.string).isRequired,
diff --git a/src/datepicker/index.scss b/src/datepicker/index.scss
index 936ff41..02131e5 100644
--- a/src/datepicker/index.scss
+++ b/src/datepicker/index.scss
@@ -1,4 +1,4 @@
-@import 'theme.scss';
+@import 'calendar_theme';
 
 .c-datepicker {
   position: relative;
diff --git a/src/datepicker/utils.es b/src/datepicker/utils.es
index d03e330..adfd54c 100644
--- a/src/datepicker/utils.es
+++ b/src/datepicker/utils.es
@@ -16,3 +16,33 @@ export const getDate = (dateOrIso) => {
   if (dateOrIso instanceof Date) return dateOrIso;
   return parseISO(dateOrIso);
 };
+
+const stripPrefix = (key, prefix) => {
+  const strippedKey = key.substring(prefix.length);
+  return strippedKey.charAt(0).toLowerCase() + strippedKey.slice(1);
+};
+
+export const getSubTheme = (theme, prefix) => (
+  Object.entries(theme || {})
+    .reduce((acc, [key, value]) => {
+      if (key.startsWith(prefix)) {
+        acc[stripPrefix(key, prefix)] = value;
+      }
+
+      return acc;
+    }, {})
+);
+
+export const mergeThemes = (baseTheme, otherTheme) => {
+  if (!otherTheme) return baseTheme;
+
+  const result = {};
+  Object.keys(baseTheme).forEach((key) => {
+    const baseValue = baseTheme[key];
+    const extendValue = otherTheme[key];
+
+    result[key] = [baseValue, extendValue].filter((v) => Boolean(v)).join(' ');
+  });
+
+  return result;
+};
diff --git a/test/datepicker/utils.js b/test/datepicker/utils.js
index 9336d5b..d2c304f 100644
--- a/test/datepicker/utils.js
+++ b/test/datepicker/utils.js
@@ -3,9 +3,57 @@ const {
   getValueFromISO,
   getValueFromDate,
   getDate,
+  mergeThemes,
+  getSubTheme,
 } = require('../../lib/datepicker/utils');
 
 describe('ui/datepicker/utils', () => {
+  describe('mergeThemes', () => {
+    it('returns first theme if second one is falsey', () => {
+      const baseTheme = {
+        root: 'classname',
+      };
+
+      assert.deepEqual(mergeThemes(baseTheme, undefined), baseTheme);
+    });
+
+    it('joins strings if both objects contain the same key', () => {
+      const baseTheme = {
+        root: 'rootClass',
+        clever: 'cleverClass',
+      };
+      const otherTheme = {
+        root: 'my-own-root',
+        notInBase: 'not-there',
+      };
+
+      assert.deepEqual(mergeThemes(baseTheme, otherTheme), {
+        root: 'rootClass my-own-root',
+        clever: 'cleverClass',
+      });
+    });
+  });
+
+  describe('getSubTheme', () => {
+    it('returns empty object for falsy theme', () => {
+      assert.deepEqual(getSubTheme(null, 'picker'), {});
+    });
+
+    it('returns object with stripped keys matching prefix', () => {
+      const theme = {
+        pickerRoot: 'some-class',
+        pickerBaseElement: 'some-base',
+        otherRoot: 'other-root',
+        otherPicker: 'other-picker',
+      };
+
+      assert.deepEqual(getSubTheme(theme, 'picker'), {
+        root: 'some-class',
+        baseElement: 'some-base',
+      });
+    });
+  });
+
   describe('getValueFromISO', () => {
     it('returns empty string for falsey values', () => {
       assert.equal(getValueFromISO(null, 'yyyy'), '');

From 976a92822520cd8132a38c111ca28fb6908edfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Tue, 21 Apr 2020 19:39:07 +0200
Subject: [PATCH 12/21] Bump beta version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5fde45d..27b623c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.3",
+  "version": "8.3.1-beta.4",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",

From 2c044d05979cebc4e489bcfcc2742bd5d339a2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 09:48:50 +0200
Subject: [PATCH 13/21] First try with theme hooks

---
 package.json            |  2 +-
 src/datepicker/hooks.es | 14 ++++++++++++++
 src/datepicker/index.es | 18 +++++++++++++-----
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/datepicker/hooks.es

diff --git a/package.json b/package.json
index 27b623c..281dacf 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.4",
+  "version": "8.3.1-beta.5",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",
diff --git a/src/datepicker/hooks.es b/src/datepicker/hooks.es
new file mode 100644
index 0000000..593b4d0
--- /dev/null
+++ b/src/datepicker/hooks.es
@@ -0,0 +1,14 @@
+import { useMemo } from 'react';
+import { mergeThemes, getSubTheme } from './utils';
+
+export const useComposedTheme = (themeA, themeB) => (
+  useMemo(() => (
+    mergeThemes(themeA, themeB)
+  ), [themeA, themeB])
+);
+
+export const useSubTheme = (theme, prefix) => (
+  useMemo(() => (
+    getSubTheme(theme, prefix)
+  ), [theme, prefix])
+);
diff --git a/src/datepicker/index.es b/src/datepicker/index.es
index 886364c..675b16e 100644
--- a/src/datepicker/index.es
+++ b/src/datepicker/index.es
@@ -10,10 +10,11 @@ import Picker from 'nebenan-react-datepicker/lib';
 import { bindTo } from '../utils';
 
 import InputComponent from '../base';
-import calendarTheme from './calendar_theme';
-import { getDate, getSubTheme, getValueFromDate, getValueFromISO, mergeThemes } from './utils';
+import baseCalendarTheme from './calendar_theme';
+import { getDate, getValueFromDate, getValueFromISO } from './utils';
+import { useComposedTheme, useSubTheme } from './hooks';
 
-class Datepicker extends InputComponent {
+class DatepickerComponent extends InputComponent {
   constructor(props) {
     super(props);
     bindTo(this,
@@ -120,7 +121,7 @@ class Datepicker extends InputComponent {
       firstDay,
       weekdayShortLabels,
       monthLabels,
-      theme: passedTheme,
+      calendarTheme,
     } = this.props;
 
     const localizedValue = getValueFromISO(value, dateFormat);
@@ -141,7 +142,7 @@ class Datepicker extends InputComponent {
           selected={getDate(value)}
           minDate={getDate(minDate)}
           maxDate={getDate(maxDate)}
-          theme={mergeThemes(calendarTheme, getSubTheme(passedTheme, 'calendar'))}
+          theme={calendarTheme}
           {...{ monthLabels, weekdayShortLabels, firstDay }}
         />
       );
@@ -178,6 +179,13 @@ class Datepicker extends InputComponent {
   }
 }
 
+const Datepicker = ({ theme: passedTheme, ...props }) => {
+  const passedCalendarTheme = useSubTheme(passedTheme, 'calendar');
+  const calendarTheme = useComposedTheme(baseCalendarTheme, passedCalendarTheme);
+
+  return <DatepickerComponent {...{ calendarTheme }} {...props} />;
+};
+
 Datepicker.propTypes = {
   ...InputComponent.propTypes,
 

From b1747d3855592e6b922be29737e24d562e8125bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 17:26:59 +0200
Subject: [PATCH 14/21] Refactor: Simplify

---
 src/datepicker/utils.es | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/datepicker/utils.es b/src/datepicker/utils.es
index adfd54c..0e1ba67 100644
--- a/src/datepicker/utils.es
+++ b/src/datepicker/utils.es
@@ -1,5 +1,6 @@
 import parseISO from 'date-fns/parseISO';
 import formatDate from 'date-fns/format';
+import clsx from 'clsx';
 
 const DATE_FORMAT_ISO = 'yyyy-MM-dd';
 
@@ -41,7 +42,7 @@ export const mergeThemes = (baseTheme, otherTheme) => {
     const baseValue = baseTheme[key];
     const extendValue = otherTheme[key];
 
-    result[key] = [baseValue, extendValue].filter((v) => Boolean(v)).join(' ');
+    result[key] = clsx(baseValue, extendValue);
   });
 
   return result;

From 2b24187454fc18e807c2afaa5c1966f53f1d68b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 17:41:42 +0200
Subject: [PATCH 15/21] Refactor: Simplify

---
 src/datepicker/utils.es  | 4 ++--
 test/datepicker/utils.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/datepicker/utils.es b/src/datepicker/utils.es
index 0e1ba67..ca313c3 100644
--- a/src/datepicker/utils.es
+++ b/src/datepicker/utils.es
@@ -23,8 +23,8 @@ const stripPrefix = (key, prefix) => {
   return strippedKey.charAt(0).toLowerCase() + strippedKey.slice(1);
 };
 
-export const getSubTheme = (theme, prefix) => (
-  Object.entries(theme || {})
+export const getSubTheme = (theme = {}, prefix) => (
+  Object.entries(theme)
     .reduce((acc, [key, value]) => {
       if (key.startsWith(prefix)) {
         acc[stripPrefix(key, prefix)] = value;
diff --git a/test/datepicker/utils.js b/test/datepicker/utils.js
index d2c304f..220ba95 100644
--- a/test/datepicker/utils.js
+++ b/test/datepicker/utils.js
@@ -9,7 +9,7 @@ const {
 
 describe('ui/datepicker/utils', () => {
   describe('mergeThemes', () => {
-    it('returns first theme if second one is falsey', () => {
+    it('returns first theme if second one is undefined', () => {
       const baseTheme = {
         root: 'classname',
       };

From 4e990d43283e4f4effd3f87d9e2d4500db38820b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 18:14:58 +0200
Subject: [PATCH 16/21] Refactor: Get rid of hooks and use lodash memorize
 instead

---
 src/datepicker/hooks.es  | 14 --------------
 src/datepicker/index.es  | 18 ++++++------------
 src/datepicker/utils.es  |  4 ++++
 test/datepicker/utils.js | 21 +++++++++++++++++++--
 4 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 src/datepicker/hooks.es

diff --git a/src/datepicker/hooks.es b/src/datepicker/hooks.es
deleted file mode 100644
index 593b4d0..0000000
--- a/src/datepicker/hooks.es
+++ /dev/null
@@ -1,14 +0,0 @@
-import { useMemo } from 'react';
-import { mergeThemes, getSubTheme } from './utils';
-
-export const useComposedTheme = (themeA, themeB) => (
-  useMemo(() => (
-    mergeThemes(themeA, themeB)
-  ), [themeA, themeB])
-);
-
-export const useSubTheme = (theme, prefix) => (
-  useMemo(() => (
-    getSubTheme(theme, prefix)
-  ), [theme, prefix])
-);
diff --git a/src/datepicker/index.es b/src/datepicker/index.es
index 675b16e..f8b810b 100644
--- a/src/datepicker/index.es
+++ b/src/datepicker/index.es
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import memorize from 'lodash/memoize';
 
 import { screenPosition, screenSize, size } from 'nebenan-helpers/lib/dom';
 import keymanager from 'nebenan-helpers/lib/keymanager';
@@ -11,10 +12,9 @@ import { bindTo } from '../utils';
 
 import InputComponent from '../base';
 import baseCalendarTheme from './calendar_theme';
-import { getDate, getValueFromDate, getValueFromISO } from './utils';
-import { useComposedTheme, useSubTheme } from './hooks';
+import { getCalendarTheme, getDate, getValueFromDate, getValueFromISO } from './utils';
 
-class DatepickerComponent extends InputComponent {
+class Datepicker extends InputComponent {
   constructor(props) {
     super(props);
     bindTo(this,
@@ -24,6 +24,7 @@ class DatepickerComponent extends InputComponent {
       'handleClick',
       'handleClear',
     );
+    this.getCalendarTheme = memorize(getCalendarTheme);
   }
 
   componentWillUnmount() {
@@ -121,7 +122,7 @@ class DatepickerComponent extends InputComponent {
       firstDay,
       weekdayShortLabels,
       monthLabels,
-      calendarTheme,
+      theme: passedTheme,
     } = this.props;
 
     const localizedValue = getValueFromISO(value, dateFormat);
@@ -142,7 +143,7 @@ class DatepickerComponent extends InputComponent {
           selected={getDate(value)}
           minDate={getDate(minDate)}
           maxDate={getDate(maxDate)}
-          theme={calendarTheme}
+          theme={this.getCalendarTheme(baseCalendarTheme, passedTheme)}
           {...{ monthLabels, weekdayShortLabels, firstDay }}
         />
       );
@@ -179,13 +180,6 @@ class DatepickerComponent extends InputComponent {
   }
 }
 
-const Datepicker = ({ theme: passedTheme, ...props }) => {
-  const passedCalendarTheme = useSubTheme(passedTheme, 'calendar');
-  const calendarTheme = useComposedTheme(baseCalendarTheme, passedCalendarTheme);
-
-  return <DatepickerComponent {...{ calendarTheme }} {...props} />;
-};
-
 Datepicker.propTypes = {
   ...InputComponent.propTypes,
 
diff --git a/src/datepicker/utils.es b/src/datepicker/utils.es
index ca313c3..56fdf83 100644
--- a/src/datepicker/utils.es
+++ b/src/datepicker/utils.es
@@ -47,3 +47,7 @@ export const mergeThemes = (baseTheme, otherTheme) => {
 
   return result;
 };
+
+export const getCalendarTheme = (baseCalendarTheme, passedTheme) => (
+  mergeThemes(baseCalendarTheme, getSubTheme(passedTheme, 'calendar'))
+);
diff --git a/test/datepicker/utils.js b/test/datepicker/utils.js
index 220ba95..db1c914 100644
--- a/test/datepicker/utils.js
+++ b/test/datepicker/utils.js
@@ -5,9 +5,26 @@ const {
   getDate,
   mergeThemes,
   getSubTheme,
+  getCalendarTheme,
 } = require('../../lib/datepicker/utils');
 
 describe('ui/datepicker/utils', () => {
+  describe('getCalendarTheme', () => {
+    it('merges base theme with calendar prefixed keys from passed theme', () => {
+      const baseCalendarTheme = {
+        root: 'base-root',
+        clever: 'base-clever',
+      };
+      const passedTheme = {
+        calendarRoot: 'my-root',
+        blubb: 'my-blubb',
+      };
+      assert.deepEqual(getCalendarTheme(baseCalendarTheme, passedTheme), {
+        root: 'base-root my-root',
+        clever: 'base-clever',
+      });
+    });
+  });
   describe('mergeThemes', () => {
     it('returns first theme if second one is undefined', () => {
       const baseTheme = {
@@ -35,8 +52,8 @@ describe('ui/datepicker/utils', () => {
   });
 
   describe('getSubTheme', () => {
-    it('returns empty object for falsy theme', () => {
-      assert.deepEqual(getSubTheme(null, 'picker'), {});
+    it('returns empty object for undefined theme', () => {
+      assert.deepEqual(getSubTheme(undefined, 'picker'), {});
     });
 
     it('returns object with stripped keys matching prefix', () => {

From 58eb925fd5b22e6c99b0c5c70998ba822fcb2b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 18:26:18 +0200
Subject: [PATCH 17/21] Extract theme helpers into nebenan-helpers

---
 package-lock.json        |  8 +++----
 package.json             |  6 ++---
 src/datepicker/utils.es  | 32 +--------------------------
 test/datepicker/utils.js | 47 ----------------------------------------
 4 files changed, 8 insertions(+), 85 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8a41fe..a6c6ae6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebenan-form",
-  "version": "8.3.1-beta.2",
+  "version": "8.3.1-beta.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8993,9 +8993,9 @@
       }
     },
     "nebenan-helpers": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.1.1.tgz",
-      "integrity": "sha512-EMsskZXressFiOU4uwdMrFkINo1G18QbWvQFrkynbpXw0+FJOyZoRtAfife6d6kX8geiR/+f4S2vo+SluQ3enw==",
+      "version": "4.2.0-beta.0",
+      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.2.0-beta.0.tgz",
+      "integrity": "sha512-xgrAP9RIDypzVPrXQ2v1mLPKxkqOhCQL9V0X8Q74ktY4YDsd40+I1w5NoDpPNUotKSJfNv+TbSVlYonQyykAHg==",
       "dev": true
     },
     "nebenan-react-datepicker": {
diff --git a/package.json b/package.json
index 281dacf..f518c07 100644
--- a/package.json
+++ b/package.json
@@ -82,8 +82,7 @@
     "stylelint": "^13.2.1",
     "stylelint-config-nebenan": "^1.6.0",
     "terser": "^4.6.7",
-    "nebenan-react-datepicker": "^1.0.0",
-    "nebenan-helpers": "^4.1.1",
+    "nebenan-helpers": "^4.2.0-beta.0",
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },
@@ -93,7 +92,8 @@
   "peerDependencies": {
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",
-    "nebenan-helpers": "^4.1.1",
+    "nebenan-helpers": "^4.2.0-beta.0",
+    "tiny-lr": "^1.1.1",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",
diff --git a/src/datepicker/utils.es b/src/datepicker/utils.es
index 56fdf83..4597907 100644
--- a/src/datepicker/utils.es
+++ b/src/datepicker/utils.es
@@ -1,6 +1,6 @@
 import parseISO from 'date-fns/parseISO';
 import formatDate from 'date-fns/format';
-import clsx from 'clsx';
+import { getSubTheme, mergeThemes } from 'nebenan-helpers/lib/themes';
 
 const DATE_FORMAT_ISO = 'yyyy-MM-dd';
 
@@ -18,36 +18,6 @@ export const getDate = (dateOrIso) => {
   return parseISO(dateOrIso);
 };
 
-const stripPrefix = (key, prefix) => {
-  const strippedKey = key.substring(prefix.length);
-  return strippedKey.charAt(0).toLowerCase() + strippedKey.slice(1);
-};
-
-export const getSubTheme = (theme = {}, prefix) => (
-  Object.entries(theme)
-    .reduce((acc, [key, value]) => {
-      if (key.startsWith(prefix)) {
-        acc[stripPrefix(key, prefix)] = value;
-      }
-
-      return acc;
-    }, {})
-);
-
-export const mergeThemes = (baseTheme, otherTheme) => {
-  if (!otherTheme) return baseTheme;
-
-  const result = {};
-  Object.keys(baseTheme).forEach((key) => {
-    const baseValue = baseTheme[key];
-    const extendValue = otherTheme[key];
-
-    result[key] = clsx(baseValue, extendValue);
-  });
-
-  return result;
-};
-
 export const getCalendarTheme = (baseCalendarTheme, passedTheme) => (
   mergeThemes(baseCalendarTheme, getSubTheme(passedTheme, 'calendar'))
 );
diff --git a/test/datepicker/utils.js b/test/datepicker/utils.js
index db1c914..dc48f05 100644
--- a/test/datepicker/utils.js
+++ b/test/datepicker/utils.js
@@ -3,8 +3,6 @@ const {
   getValueFromISO,
   getValueFromDate,
   getDate,
-  mergeThemes,
-  getSubTheme,
   getCalendarTheme,
 } = require('../../lib/datepicker/utils');
 
@@ -25,51 +23,6 @@ describe('ui/datepicker/utils', () => {
       });
     });
   });
-  describe('mergeThemes', () => {
-    it('returns first theme if second one is undefined', () => {
-      const baseTheme = {
-        root: 'classname',
-      };
-
-      assert.deepEqual(mergeThemes(baseTheme, undefined), baseTheme);
-    });
-
-    it('joins strings if both objects contain the same key', () => {
-      const baseTheme = {
-        root: 'rootClass',
-        clever: 'cleverClass',
-      };
-      const otherTheme = {
-        root: 'my-own-root',
-        notInBase: 'not-there',
-      };
-
-      assert.deepEqual(mergeThemes(baseTheme, otherTheme), {
-        root: 'rootClass my-own-root',
-        clever: 'cleverClass',
-      });
-    });
-  });
-
-  describe('getSubTheme', () => {
-    it('returns empty object for undefined theme', () => {
-      assert.deepEqual(getSubTheme(undefined, 'picker'), {});
-    });
-
-    it('returns object with stripped keys matching prefix', () => {
-      const theme = {
-        pickerRoot: 'some-class',
-        pickerBaseElement: 'some-base',
-        otherRoot: 'other-root',
-        otherPicker: 'other-picker',
-      };
-
-      assert.deepEqual(getSubTheme(theme, 'picker'), {
-        root: 'some-class',
-        baseElement: 'some-base',
-      });
-    });
-  });
 
   describe('getValueFromISO', () => {
     it('returns empty string for falsey values', () => {

From 13c768d174211c0f0866e9aeeea141ee8ab30dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Wed, 22 Apr 2020 19:12:44 +0200
Subject: [PATCH 18/21] Fix wrong usage of lodash memorize

---
 src/datepicker/index.es | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/datepicker/index.es b/src/datepicker/index.es
index f8b810b..a46d97e 100644
--- a/src/datepicker/index.es
+++ b/src/datepicker/index.es
@@ -24,7 +24,7 @@ class Datepicker extends InputComponent {
       'handleClick',
       'handleClear',
     );
-    this.getCalendarTheme = memorize(getCalendarTheme);
+    this.getCalendarTheme = memorize(getCalendarTheme.bind(null, baseCalendarTheme));
   }
 
   componentWillUnmount() {
@@ -143,7 +143,7 @@ class Datepicker extends InputComponent {
           selected={getDate(value)}
           minDate={getDate(minDate)}
           maxDate={getDate(maxDate)}
-          theme={this.getCalendarTheme(baseCalendarTheme, passedTheme)}
+          theme={this.getCalendarTheme(passedTheme)}
           {...{ monthLabels, weekdayShortLabels, firstDay }}
         />
       );

From 357c2d586787ba61af8a2157bebb9c0003738219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Fri, 24 Apr 2020 09:20:30 +0200
Subject: [PATCH 19/21] Remove unneeded peer dependency

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index f518c07..6285a37 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",
     "nebenan-helpers": "^4.2.0-beta.0",
-    "tiny-lr": "^1.1.1",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",

From 346c2e2bb9ec2fc79d0635a6918c2c58a2180d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Fri, 24 Apr 2020 09:32:55 +0200
Subject: [PATCH 20/21] Update nebenan-helpers to release version

---
 package-lock.json | 6 +++---
 package.json      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6c6ae6..d4ab807 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8993,9 +8993,9 @@
       }
     },
     "nebenan-helpers": {
-      "version": "4.2.0-beta.0",
-      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.2.0-beta.0.tgz",
-      "integrity": "sha512-xgrAP9RIDypzVPrXQ2v1mLPKxkqOhCQL9V0X8Q74ktY4YDsd40+I1w5NoDpPNUotKSJfNv+TbSVlYonQyykAHg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/nebenan-helpers/-/nebenan-helpers-4.2.0.tgz",
+      "integrity": "sha512-TOcvQ1LcC720lygG4vcF63SERqbigyswwstAlFeVV1gHZKVm0vb3qeerWGvjcAWZfshhe4ixaL+ZMQf4d0WwxQ==",
       "dev": true
     },
     "nebenan-react-datepicker": {
diff --git a/package.json b/package.json
index 6285a37..0e5a688 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "stylelint": "^13.2.1",
     "stylelint-config-nebenan": "^1.6.0",
     "terser": "^4.6.7",
-    "nebenan-helpers": "^4.2.0-beta.0",
+    "nebenan-helpers": "^4.2.0",
     "tiny-lr": "^1.1.1",
     "vinyl-source-stream": "^2.0.0"
   },
@@ -92,7 +92,7 @@
   "peerDependencies": {
     "@babel/runtime": "^7.9.2",
     "clsx": "^1.1.0",
-    "nebenan-helpers": "^4.2.0-beta.0",
+    "nebenan-helpers": "^4.2.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2",
     "react": "^16.13.1",

From 73ebff0488abb762bf6cff9b43f311de9de01c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Ha=C3=9Fler?= <peter.h@nebenan.de>
Date: Fri, 24 Apr 2020 09:33:35 +0200
Subject: [PATCH 21/21] Bump to 'release' patch version

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d4ab807..58af6ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebenan-form",
-  "version": "8.3.1-beta.5",
+  "version": "8.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0e5a688..f0741df 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "homepage": "https://nebenan.de/",
   "repository": "good-hood-gmbh/nebenan-form",
   "bugs": "https://github.com/good-hood-gmbh/nebenan-form/issues",
-  "version": "8.3.1-beta.5",
+  "version": "8.3.1",
   "scripts": {
     "reinstall": "rm -rf node_modules package-lock.json && npm install && npm run decache",
     "decache": "find ./build -type f -name '.browserify-cache.json' -delete || echo \"\\033[0;32mAlready decached!\\033[0m\"",