Skip to content

Commit

Permalink
Tooltips, fixes and addition (#2006)
Browse files Browse the repository at this point in the history
- Fixes for tooltips lagging and getting stuck if the pointer happens to hover over the tooltip.
- Fix for tooltips appearing behind other elements.
- Addition of tooltips for editor tools.
- Fix for tooltip appearance in related tables form.
  • Loading branch information
Flodkvist authored Jun 10, 2024
1 parent 0f58c79 commit d556236
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
3 changes: 2 additions & 1 deletion scss/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
display: inline-block;
opacity: 1;
visibility: visible;
z-index: 100;
}

.o-tooltip:hover span[data-tooltip]::after {
Expand All @@ -36,7 +37,7 @@
text-align: center;
white-space: nowrap;
width: auto;
z-index: 100;
pointer-events: none;
}

@media (hover: none) {
Expand Down
15 changes: 10 additions & 5 deletions src/controls/editor/editortemplate.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
export default `<div id="o-editor-toolbar" class="o-editor-toolbar o-toolbar o-toolbar-horizontal o-padding-horizontal-8 o-rounded-top o-hidden">
<div id="o-editor-toolbar-drawtools" class="o-toolbar-horizontal">
<div class="o-popover-container">
<button id="o-editor-draw" class="o-button-lg" type="button" name="button">
<button id="o-editor-draw" class="o-button-lg o-tooltip" style aria-label="Nytt objekt" type="button" name="button">
<svg class="o-icon-24">
<use xlink:href="#ic_add_24px"></use>
</svg>
<span data-tooltip="Nytt objekt" data-placement="north"></span>
</button>
</div>
</div>
<button id="o-editor-attribute" class="o-button-lg" type="button" name="button">
<button id="o-editor-attribute" class="o-button-lg o-tooltip" style aria-label="Formulär" type="button" name="button">
<svg class="o-icon-24">
<use xlink:href="#ic_title_24px"></use>
</svg>
<span data-tooltip="Formulär" data-placement="north"></span>
</button>
<button id="o-editor-delete" class="o-button-lg" type="button" name="button">
<button id="o-editor-delete" class="o-button-lg o-tooltip" style aria-label="Radera" type="button" name="button">
<svg class="o-icon-24">
<use xlink:href="#ic_delete_24px"></use>
</svg>
<span data-tooltip="Radera" data-placement="north"></span>
</button>
<div class="o-popover-container">
<button id="o-editor-layers" class="o-button-lg" type="button" name="button">
<button id="o-editor-layers" class="o-button-lg o-tooltip" style aria-label="Lager" type="button" name="button">
<svg class="o-icon-24">
<use xlink:href="#ic_layers_24px"></use>
</svg>
<span data-tooltip="Lager" data-placement="north"></span>
</button>
</div>
<button id="o-editor-save" class="o-button-lg o-disabled" type="button" name="button">
<button id="o-editor-save" class="o-button-lg o-disabled o-tooltip" style aria-label="Spara" type="button" name="button">
<svg class="o-icon-24">
<use xlink:href="#ic_save_24px"></use>
</svg>
<span data-tooltip="Spara" data-placement="north"></span>
</button>
</div>`;
2 changes: 1 addition & 1 deletion src/controls/editor/relatedtablesform.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function relatedTablesForm(viewer, layer, feature, el) {

// Add the deletebutton to the row
if (!relatedLayerConf.disableDelete) {
const deleteButtonEl = createElement('button', '<span class="icon-smaller"><svg class="o-icon-24"><use xlink:href="#ic_delete_24px"></use></svg></span><span data-tooltip="Ta bort"></span>', { cls: 'compact o-tooltip hover', 'aria-label': 'Ta bort' });
const deleteButtonEl = createElement('button', '<span class="icon"><svg class="o-icon-24"><use xlink:href="#ic_delete_24px"></use></svg></span><span data-tooltip="Ta bort"></span>', { cls: 'compact o-tooltip hover', 'aria-label': 'Ta bort' });
deleteButtonEl.addEventListener('click', () => {
if (window.confirm(`Är du säker att du vill ta bort objektet ${itemTitle}?`)) {
editdispatcher.emitDeleteChild(childLayer, feature, currChild);
Expand Down

0 comments on commit d556236

Please sign in to comment.