1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: Reduce usage of the id attribute

Browse Source 
It is not always required, limit it to the cases where it is
explicitly given, or if it is necessary.

Fixes: QTBUG-135024
Change-Id: I451379d86543e2297574d4cda09ef825736f9c5d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Even Oscar Andersen 2025-04-11 07:28:27 +02:00
parent b27820fbf8
commit a7136c3e7b
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/platforms/wasm/qwasmaccessibility.cpp
View File

@ -8,6 +8,8 @@
#include <QtCore/private/qwasmsuspendresumecontrol_p.h> #include <QtCore/private/qwasmsuspendresumecontrol_p.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include <sstream>
#if QT_CONFIG(accessibility) #if QT_CONFIG(accessibility)
#include <QtGui/private/qaccessiblebridgeutils_p.h> #include <QtGui/private/qaccessiblebridgeutils_p.h>
@ -231,15 +233,11 @@ emscripten::val QWasmAccessibility::createHtmlElement(QAccessibleInterface *ifac
case QAccessible::PageTabList:{ case QAccessible::PageTabList:{
element = document.call<emscripten::val>("createElement", std::string("div")); element = document.call<emscripten::val>("createElement", std::string("div"));
element.call<void>("setAttribute", std::string("role"), std::string("tablist")); element.call<void>("setAttribute", std::string("role"), std::string("tablist"));
QString idName = iface->text(QAccessible::Name).replace(" ", "_");
idName += "_tabList";
element.call<void>("setAttribute", std::string("id"), idName.toStdString());
for (int i = 0; i < iface->childCount(); ++i) { for (int i = 0; i < iface->childCount(); ++i) {
if (iface->child(i)->role() == QAccessible::PageTab){ if (iface->child(i)->role() == QAccessible::PageTab){
emscripten::val elementTab = emscripten::val::undefined(); emscripten::val elementTab = emscripten::val::undefined();
elementTab = ensureHtmlElement(iface->child(i)); elementTab = ensureHtmlElement(iface->child(i));
elementTab.call<void>("setAttribute", std::string("aria-owns"), idName.toStdString());
setHtmlElementGeometry(iface->child(i)); setHtmlElementGeometry(iface->child(i));
} }
} }
@ -315,12 +313,6 @@ emscripten::val QWasmAccessibility::createHtmlElement(QAccessibleInterface *ifac
element = document.call<emscripten::val>("createElement", std::string("div")); element = document.call<emscripten::val>("createElement", std::string("div"));
} }
QString id = QAccessibleBridgeUtils::accessibleId(iface);
if (iface->role() != QAccessible::PageTabList)
element.call<void>("setAttribute", std::string("id"), id.toStdString());
element.call<void>("addEventListener", emscripten::val("focus"),
emscripten::val::module_property("qtEventReceived"), true);
return element; return element;
}(); }();
@ -610,6 +602,7 @@ void QWasmAccessibility::populateAccessibilityTree(QAccessibleInterface *iface)
setHtmlElementGeometry(iface); setHtmlElementGeometry(iface);
setHtmlElementTextName(iface); setHtmlElementTextName(iface);
setHtmlElementDescription(iface); setHtmlElementDescription(iface);
handleIdentifierUpdate(iface);
} }
for (int i = 0; i < iface->childCount(); ++i) for (int i = 0; i < iface->childCount(); ++i)
populateAccessibilityTree(iface->child(i)); populateAccessibilityTree(iface->child(i));
@ -740,6 +733,30 @@ void QWasmAccessibility::handlePageTabListUpdate(QAccessibleEvent *event)
} }
} }
void QWasmAccessibility::handleIdentifierUpdate(QAccessibleInterface *iface)
{
emscripten::val element = ensureHtmlElement(iface);
QString id = iface->text(QAccessible::Identifier).replace(" ", "_");
if (id.isEmpty() && iface->role() == QAccessible::PageTabList) {
std::ostringstream oss;
oss << "tabList_0x" << (void *)iface;
id = QString::fromUtf8(oss.str());
}
if (!id.isEmpty()) {
element.call<void>("setAttribute", std::string("id"), id.toStdString());
if (iface->role() == QAccessible::PageTabList) {
for (int i = 0; i < iface->childCount(); ++i) {
auto child = ensureHtmlElement(iface->child(i));
child.call<void>("setAttribute", std::string("aria-owns"), id.toStdString());
}
}
} else {
element.call<void>("removeAttribute", std::string("id"));
}
}
void QWasmAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event) void QWasmAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
{ {
if (!m_accessibilityEnabled) if (!m_accessibilityEnabled)
@ -758,6 +775,9 @@ void QWasmAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event)
setHtmlElementFocus(iface); setHtmlElementFocus(iface);
break; break;
case QAccessible::IdentifierChanged:
handleIdentifierUpdate(iface);
return;
case QAccessible::ObjectShow: case QAccessible::ObjectShow:
setHtmlElementVisibility(iface, true); setHtmlElementVisibility(iface, true);

1
src/plugins/platforms/wasm/qwasmaccessibility.h
View File

@ -69,6 +69,7 @@ private:
void handleSliderUpdate(QAccessibleEvent *event); void handleSliderUpdate(QAccessibleEvent *event);
void handleScrollBarUpdate(QAccessibleEvent *event); void handleScrollBarUpdate(QAccessibleEvent *event);
void handlePageTabListUpdate(QAccessibleEvent *event); void handlePageTabListUpdate(QAccessibleEvent *event);
void handleIdentifierUpdate(QAccessibleInterface *iface);
void handleEventFromHtmlElement(const emscripten::val event); void handleEventFromHtmlElement(const emscripten::val event);