Skip to content

fix: correct height and error styles for map with showOSSearch enabled #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jessicamcinchak wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: correct height and error styles for map with showOSSearch enabled #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ <h1 style="color: red; font-size: 16px">
drawMode
drawMany
drawType="Point"
basemap="MapboxSatellite"
basemap="OSVectorTile"
showOSSearch
showCentreMarker
osCopyright="© Crown copyright and database rights 2024 OS AC0000812160"
osProxyEndpoint="https://api.editor.planx.dev/proxy/ordnance-survey"
Expand Down
65 changes: 40 additions & 25 deletions src/components/my-map/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,10 @@ export class MyMap extends LitElement {
"addressSelection",
({ detail: address }: any) => {
console.debug("searched", { detail: address });
// Clear any pre-existing errors on new search
this._searchError = "";
this._showSearchError();

const searchedAddress = address?.address?.LPI;
const newCenterCoordinate = transform(
[searchedAddress.LNG, searchedAddress.LAT],
Expand All @@ -820,7 +824,7 @@ export class MyMap extends LitElement {
} else {
// Show an error
this._searchError =
"Selected address not within map view extent, try another.";
"Selected address not within map view extent, try another";
this._showSearchError();
}
},
Expand All @@ -847,6 +851,15 @@ export class MyMap extends LitElement {
// display "none" ensures always present in DOM, which means role="status" will work for screenreaders
if (errorEl) errorEl.style.display = "none";
if (errorEl && this._searchError) errorEl.style.display = "";
if (errorEl && !this._searchError) errorEl.style.display = "none";

// additionally set error style on outer div to match govuk style
const errorWrapperEl: HTMLElement | null | undefined =
this.shadowRoot?.querySelector(`.govuk-form-group`);
if (errorWrapperEl && this._searchError)
errorWrapperEl.classList.add("govuk-form-group--error");
if (errorWrapperEl && !this._searchError)
errorWrapperEl.classList.remove("govuk-form-group--error");
}

// render the map
Expand All @@ -858,35 +871,37 @@ export class MyMap extends LitElement {
(Boolean(this.osApiKey) || Boolean(this.osProxyEndpoint));

return this._showSearch
? html` <div
id="error-message-container"
class="${this._searchError ? "govuk-warning-text" : ""}"
role="status"
>
? html` <link
rel="stylesheet"
href="https://cdn.skypack.dev/ol@^6.6.1/ol.css"
/>
<div class="govuk-form-group">
<div
id="geocode-autocomplete-error"
class="govuk-error-message"
style="display:none"
id="error-message-container"
class="${this._searchError ? "govuk-warning-text" : ""}"
role="status"
>
<span class="govuk-visually-hidden">Error:</span>
${this._searchError}
</div>
<div style="margin-bottom: 1em; background-color: white">
<geocode-autocomplete
id="geocode-autocomplete"
arrowStyle="light"
labelStyle="static"
label="Search for an address to position the map"
osApiKey="${this.osApiKey}"
osProxyEndpoint="${this.osProxyEndpoint}"
/>
<div
id="geocode-autocomplete-error"
class="govuk-error-message"
style="display:none"
role="status"
>
<span class="govuk-visually-hidden">Error:</span>
${this._searchError}
</div>
<div style="background-color: white">
<geocode-autocomplete
id="geocode-autocomplete"
arrowStyle="light"
labelStyle="static"
label="Search for an address to position the map (optional)"
osApiKey="${this.osApiKey}"
osProxyEndpoint="${this.osProxyEndpoint}"
/>
</div>
</div>
</div>
<link
rel="stylesheet"
href="https://cdn.skypack.dev/ol@^6.6.1/ol.css"
/>
<div
id="${this.id}"
class="map"
Expand Down