From b2b6cb5c19591d142a80a597caba15ecd2c58296 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Tue, 18 Oct 2022 11:51:03 +0200
Subject: [PATCH] add support for field type `colour`

see https://github.com/ideditor/schema-builder/pull/38
---
 CHANGELOG.md               | 6 ++++--
 modules/ui/fields/index.js | 2 ++
 modules/ui/fields/input.js | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41bd4a55e..e3ce77d8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,7 +46,9 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :bug: Bugfixes
 * Fix selection of best background source when starting on a zoomed-out view ([#9325])
 #### :rocket: Presets
-* add support for tagging schema v5 ([#9320])
+* Support tagging schema v5 ([#9320]):
+  * Add new field type `colour` ([schema-builder#38], [#8782])
+  * Add ability to reference strings of other presets/fields
 * Render `natural=strait` features in blue color ([#9294])
 #### :hammer: Development
 * Synchronize fetching of released presets
@@ -55,7 +57,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#9294]: https://github.com/openstreetmap/iD/issues/9294
 [#9320]: https://github.com/openstreetmap/iD/pull/9320
 [#9325]: https://github.com/openstreetmap/iD/issues/9325
-
+[schema-builder#38]: https://github.com/ideditor/schema-builder/pull/38
 
 # 2.22.0
 ##### 2022-Sep-27
diff --git a/modules/ui/fields/index.js b/modules/ui/fields/index.js
index a8edc7e2b..2c289641b 100644
--- a/modules/ui/fields/index.js
+++ b/modules/ui/fields/index.js
@@ -30,6 +30,7 @@ import {
 } from './combo';
 
 import {
+    uiFieldColour,
     uiFieldEmail,
     uiFieldIdentifier,
     uiFieldNumber,
@@ -59,6 +60,7 @@ export var uiFields = {
     access: uiFieldAccess,
     address: uiFieldAddress,
     check: uiFieldCheck,
+    colour: uiFieldColour,
     combo: uiFieldCombo,
     cycleway: uiFieldCycleway,
     defaultCheck: uiFieldDefaultCheck,
diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js
index 84cb65e9a..b0ea36495 100644
--- a/modules/ui/fields/input.js
+++ b/modules/ui/fields/input.js
@@ -11,11 +11,13 @@ import { svgIcon } from '../../svg/icon';
 import { cardinal } from '../../osm/node';
 
 export {
-    uiFieldText as uiFieldUrl,
+    uiFieldText as uiFieldColour,
+    uiFieldText as uiFieldEmail,
     uiFieldText as uiFieldIdentifier,
     uiFieldText as uiFieldNumber,
     uiFieldText as uiFieldTel,
-    uiFieldText as uiFieldEmail
+    uiFieldText,
+    uiFieldText as uiFieldUrl
 };