Skip to content
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

[web] Add 'flt-semantics-identifier' attribute to semantics nodes #53278

Merged
merged 4 commits into from
Jun 20, 2024
Merged

[web] Add 'flt-semantics-identifier' attribute to semantics nodes #53278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
613081e
[web] Add 'semantics-identifier' attribute to semantics nodes
mdebbar Jun 7, 2024
5859329
Merge branch 'main' into semantics_identifier
mdebbar Jun 14, 2024
e535b20
use the `flt-` prefix
mdebbar Jun 20, 2024
4ef453b
Merge branch 'main' into semantics_identifier
mdebbar Jun 20, 2024
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
32 changes: 32 additions & 0 deletions lib/web_ui/lib/src/engine/semantics/semantics.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,18 @@ abstract class PrimaryRoleManager {
for (final RoleManager secondaryRole in secondaryRoles) {
secondaryRole.update();
}

if (semanticsObject.isIdentifierDirty) {
_updateIdentifier();
}
}

void _updateIdentifier() {
if (semanticsObject.hasIdentifier) {
setAttribute('flt-semantics-identifier', semanticsObject.identifier!);
} else {
removeAttribute('flt-semantics-identifier');
}
}

/// Whether this role manager was disposed of.
Expand Down Expand Up @@ -1119,6 +1131,21 @@ class SemanticsObject {
_dirtyFields |= _headingLevelIndex;
}

/// See [ui.SemanticsUpdateBuilder.updateNode].
String? get identifier => _identifier;
String? _identifier;

bool get hasIdentifier => _identifier != null && _identifier!.isNotEmpty;

static const int _identifierIndex = 1 << 25;

/// Whether the [identifier] field has been updated but has not been
/// applied to the DOM yet.
bool get isIdentifierDirty => _isDirty(_identifierIndex);
void _markIdentifierDirty() {
_dirtyFields |= _identifierIndex;
}

/// A unique permanent identifier of the semantics node in the tree.
final int id;

Expand Down Expand Up @@ -1278,6 +1305,11 @@ class SemanticsObject {
_markFlagsDirty();
}

if (_identifier != update.identifier) {
_identifier = update.identifier;
_markIdentifierDirty();
}

if (_value != update.value) {
_value = update.value;
_markValueDirty();
Expand Down
65 changes: 65 additions & 0 deletions lib/web_ui/test/engine/semantics/semantics_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ void runSemanticsTests() {
group('longestIncreasingSubsequence', () {
_testLongestIncreasingSubsequence();
});
group(PrimaryRoleManager, () {
_testPrimaryRoleManager();
});
group('Role managers', () {
_testRoleManagerLifecycle();
});
Expand Down Expand Up @@ -107,6 +110,68 @@ void runSemanticsTests() {
});
}

void _testPrimaryRoleManager() {
test('Sets id and flt-semantics-identifier on the element', () {
semantics()
..debugOverrideTimestampFunction(() => _testTime)
..semanticsEnabled = true;

final SemanticsTester tester = SemanticsTester(owner());
tester.updateNode(
id: 0,
children: <SemanticsNodeUpdate>[
tester.updateNode(id: 372),
tester.updateNode(id: 599),
],
);
tester.apply();

tester.expectSemantics('''
<sem id="flt-semantic-node-0">
<sem-c>
<sem id="flt-semantic-node-372"></sem>
<sem id="flt-semantic-node-599"></sem>
</sem-c>
</sem>''');

tester.updateNode(
id: 0,
children: <SemanticsNodeUpdate>[
tester.updateNode(id: 372, identifier: 'test-id-123'),
tester.updateNode(id: 599),
],
);
tester.apply();

tester.expectSemantics('''
<sem id="flt-semantic-node-0">
<sem-c>
<sem id="flt-semantic-node-372" flt-semantics-identifier="test-id-123"></sem>
<sem id="flt-semantic-node-599"></sem>
</sem-c>
</sem>''');

tester.updateNode(
id: 0,
children: <SemanticsNodeUpdate>[
tester.updateNode(id: 372),
tester.updateNode(id: 599, identifier: 'test-id-211'),
tester.updateNode(id: 612, identifier: 'test-id-333'),
],
);
tester.apply();

tester.expectSemantics('''
<sem id="flt-semantic-node-0">
<sem-c>
<sem id="flt-semantic-node-372"></sem>
<sem id="flt-semantic-node-599" flt-semantics-identifier="test-id-211"></sem>
<sem id="flt-semantic-node-612" flt-semantics-identifier="test-id-333"></sem>
</sem-c>
</sem>''');
});
}

void _testRoleManagerLifecycle() {
test('Secondary role managers are added upon node initialization', () {
semantics()
Expand Down