Skip to content

PlgMimic: Enable tooltips on mobile browser #123

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

Open
kumajaya wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PlgMimic: Enable tooltips on mobile browser #123

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
8 changes: 6 additions & 2 deletions ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/css/mimic.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
.mimic-wrapper {
.tooltip.show .tooltip-inner {
text-align: left;
max-width: none;
white-space: nowrap;
}
.mimic-wrapper {
overflow: auto;
overscroll-behavior: none;
position: relative;
Expand Down Expand Up @@ -38,7 +43,6 @@
.mimic-wrapper.view-mode .mimic .comp.wait-action {
cursor: wait !important;
}

.mimic-wrapper.edit-mode {
cursor: default;
}
Expand Down
2 changes: 1 addition & 1 deletion ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/css/mimic.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/css/mimic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ $component-selected-box-shadow: 0 0 0 3px lime;
$component-hover-box-shadow: 0 0 0 1px var(--bs-gray-500);
$component-fiction-border: 1px dashed var(--bs-gray-600);

// Bootstrap tooltip override
.tooltip.show .tooltip-inner {
text-align: left;
max-width: none;
white-space: nowrap;
}

.mimic-wrapper {
overflow: auto;
overscroll-behavior: none;
Expand Down
39 changes: 32 additions & 7 deletions ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/js/mimic-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4704,12 +4704,24 @@ rs.mimic.MimicRenderer = class MimicRenderer extends rs.mimic.Renderer {
this._setCornerRadius(mimicElem, props.cornerRadius);
}

mimicElem
.attr("title", props.tooltip)
.css({
"background-color": props.backColor,
"color": props.foreColor
});
// Tooltip: native title for desktop, Bootstrap for touch devices
if (props.tooltip) {
const isTouchDevice = ('ontouchstart' in window || navigator.maxTouchPoints > 0);

if (isTouchDevice) {
mimicElem.prop("title", props.tooltip.replace(/\n|\r\n|\r/g, '<br>'));
mimicElem.attr("data-bs-toggle", "tooltip");
mimicElem.attr("data-bs-html", true);
mimicElem.addClass("user-select-none");
} else {
mimicElem.attr("title", props.tooltip);
}
}

mimicElem.css({
"background-color": props.backColor,
"color": props.foreColor
});

if (props.backgroundImage) {
let x = props.backgroundPadding.left;
Expand Down Expand Up @@ -5134,7 +5146,20 @@ rs.mimic.RegularComponentRenderer = class extends rs.mimic.ComponentRenderer {
this._setBorder(componentElem, props.border);
this._setCornerRadius(componentElem, props.cornerRadius);
this._setFont(componentElem, props.font, renderContext.fontMap);
componentElem.attr("title", props.tooltip);

// Tooltip: native title for desktop, Bootstrap for touch devices
if (props.tooltip) {
const isTouchDevice = ('ontouchstart' in window || navigator.maxTouchPoints > 0);

if (isTouchDevice) {
componentElem.prop("title", props.tooltip.replace(/\n|\r\n|\r/g, '<br>'));
componentElem.attr("data-bs-toggle", "tooltip");
componentElem.attr("data-bs-html", true);
componentElem.addClass("user-select-none");
} else {
componentElem.attr("title", props.tooltip);
}
}

if (props.enabled) {
this._restoreVisualState(componentElem, props);
Expand Down
39 changes: 32 additions & 7 deletions ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/js/mimic-render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,24 @@ rs.mimic.MimicRenderer = class MimicRenderer extends rs.mimic.Renderer {
this._setCornerRadius(mimicElem, props.cornerRadius);
}

mimicElem
.attr("title", props.tooltip)
.css({
"background-color": props.backColor,
"color": props.foreColor
});
// Tooltip: native title for desktop, Bootstrap for touch devices
if (props.tooltip) {
const isTouchDevice = ('ontouchstart' in window || navigator.maxTouchPoints > 0);

if (isTouchDevice) {
mimicElem.prop("title", props.tooltip.replace(/\n|\r\n|\r/g, '<br>'));
mimicElem.attr("data-bs-toggle", "tooltip");
mimicElem.attr("data-bs-html", true);
mimicElem.addClass("user-select-none");
} else {
mimicElem.attr("title", props.tooltip);
}
}

mimicElem.css({
"background-color": props.backColor,
"color": props.foreColor
});

if (props.backgroundImage) {
let x = props.backgroundPadding.left;
Expand Down Expand Up @@ -752,7 +764,20 @@ rs.mimic.RegularComponentRenderer = class extends rs.mimic.ComponentRenderer {
this._setBorder(componentElem, props.border);
this._setCornerRadius(componentElem, props.cornerRadius);
this._setFont(componentElem, props.font, renderContext.fontMap);
componentElem.attr("title", props.tooltip);

// Tooltip: native title for desktop, Bootstrap for touch devices
if (props.tooltip) {
const isTouchDevice = ('ontouchstart' in window || navigator.maxTouchPoints > 0);

if (isTouchDevice) {
componentElem.prop("title", props.tooltip.replace(/\n|\r\n|\r/g, '<br>'));
componentElem.attr("data-bs-toggle", "tooltip");
componentElem.attr("data-bs-html", true);
componentElem.addClass("user-select-none");
} else {
componentElem.attr("title", props.tooltip);
}
}

if (props.enabled) {
this._restoreVisualState(componentElem, props);
Expand Down
10 changes: 10 additions & 0 deletions ScadaWeb/Mimics/PlgMimic/wwwroot/plugins/Mimic/js/mimic-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,15 @@ function updateLayout() {
alignHorizontally();
}

// Initialize Bootstrap tooltips on all mimic elements
function initTooltips() {
if (mimic.dom && typeof bootstrap !== "undefined") {
mimic.dom.find("[data-bs-toggle='tooltip']").each(function () {
bootstrap.Tooltip.getOrCreateInstance(this);
});
}
}

async function loadMimic() {
spinnerElem.removeClass("d-none");
let result = await mimic.load(getLoaderUrl(), viewID);
Expand All @@ -159,6 +168,7 @@ async function loadMimic() {
mimicWrapperElem.append(unitedRenderer.createMimicDom());
toolbarElem.removeClass("d-none");
initScale();
initTooltips();
startUpdatingData();
startBlinking();
}
Expand Down