Skip to content

[JavaScript] Move 'isDisplayed' atom to be typescript #17316

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
AutomatedTester wants to merge 7 commits into
base: trunk
Choose a base branch
from
Open

[JavaScript] Move 'isDisplayed' atom to be typescript #17316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1aee808
[JavaScript] Move 'isDisplayed' atom to be typescript
AutomatedTester Apr 8, 2026
32342c3
Use typescript output
AutomatedTester Apr 8, 2026
4bd8a50
move test to not have closure
AutomatedTester Apr 8, 2026
970bd0a
formatting
AutomatedTester Apr 9, 2026
c45daee
Handle comments
AutomatedTester Apr 10, 2026
407f0ac
Merge branch 'trunk' into atoms-ts-isdisplayed
AutomatedTester Apr 18, 2026
6bcf634
[javascript] Generate is-displayed-global.js from TypeScript source v…
AutomatedTester Apr 20, 2026
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
57 changes: 56 additions & 1 deletion javascript/atoms/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,62 @@
load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_run_binary")
load("@rules_closure//closure:defs.bzl", "closure_js_library")
load("//javascript:defs.bzl", "closure_js_deps", "closure_test_suite")

package(default_visibility = ["//visibility:public"])

js_binary(
name = "strip_trailing_semicolon",
data = ["typescript/strip-trailing-semicolon.js"],
entry_point = "typescript/strip-trailing-semicolon.js",
)

js_binary(
name = "wrap_as_global",
data = ["typescript/wrap-as-global.js"],
entry_point = "typescript/wrap-as-global.js",
)

js_run_binary(
name = "is-displayed-typescript-compiled",
srcs = ["typescript/is-displayed.ts"],
outs = ["typescript/is-displayed.compiled.js"],
args = [
"--target",
"ES2017",
"--module",
"none",
"--removeComments",
"--pretty",
"false",
"--outFile",
"$(rootpath :typescript/is-displayed.compiled.js)",
"$(rootpath typescript/is-displayed.ts)",
],
tool = "@npm_typescript//:tsc",
)

js_run_binary(
name = "is-displayed-typescript-generated",
srcs = [":is-displayed-typescript-compiled"],
outs = ["typescript/is-displayed.generated.js"],
args = [
"$(rootpath :is-displayed-typescript-compiled)",
"$(rootpath :typescript/is-displayed.generated.js)",
],
tool = ":strip_trailing_semicolon",
)

js_run_binary(
name = "is-displayed-global",
srcs = [":is-displayed-typescript-compiled"],
outs = ["typescript/is-displayed-global.js"],
args = [
"$(rootpath :is-displayed-typescript-compiled)",
"$(rootpath :typescript/is-displayed-global.js)",
],
tool = ":wrap_as_global",
)

filegroup(
name = "atoms",
srcs = glob([
Expand All @@ -11,7 +65,8 @@ filegroup(
"**/*.js",
"**/*.png",
"**/*.svg",
]),
"**/*.ts",
]) + [":is-displayed-global"],
visibility = [
"//dotnet/test:__subpackages__",
"//java/test/org/openqa/selenium/environment:__pkg__",
Expand Down
16 changes: 16 additions & 0 deletions javascript/atoms/fragments/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("//common:defs.bzl", "copy_file")
load("//javascript:defs.bzl", "closure_fragment")

closure_fragment(
Expand Down Expand Up @@ -130,6 +131,21 @@ closure_fragment(
],
)

copy_file(
name = "is-displayed-typescript",
src = "//javascript/atoms:typescript/is-displayed.generated.js",
out = "is-displayed-typescript.js",
Comment thread
AutomatedTester marked this conversation as resolved.
visibility = [
"//dotnet/src/webdriver:__pkg__",
"//java/src/org/openqa/selenium/remote:__pkg__",
"//javascript/chrome-driver:__pkg__",
"//javascript/ie-driver:__pkg__",
"//javascript/selenium-webdriver/lib/atoms:__pkg__",
"//py:__pkg__",
"//rb/lib/selenium/webdriver/atoms:__pkg__",
],
)

closure_fragment(
name = "is-editable",
function = "bot.dom.isEditable",
Expand Down
230 changes: 230 additions & 0 deletions javascript/atoms/test/html5/shadow_dom_typescript_test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="/filez/_main/third_party/js/qunit/qunit.css">
<script src="/filez/_main/third_party/js/qunit/qunit.js"></script>
<script src="/filez/_main/third_party/js/qunit/qunit_test_runner.js"></script>
<script src="../test_bootstrap.js"></script>
<script src="../../typescript/is-displayed-global.js"></script>
<script type="text/javascript">
goog.require('bot.dom');
</script>
</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>

<h1>Page for Shadow DOM tests</h1>

<div id="is-shown">Foo</div>
<div id="is-shown-in-shadow"></div>
<div id="is-shown-directly-in-shadow"></div>
<div id="is-shown-in-slot"><div>Foo</div></div>

<div id="get-parent"><div></div></div>
<div id="get-parent-slot"><div></div></div>

<div id="get-text">Foo</div>
<div id="get-text-shadow"></div>
<div id="get-text-slot">Foo</div>
<div id="get-text-slots">
<div slot="a">Foo</div>
<div slot="b">Bar</div>
<div slot="c">Baz</div>
</div>

<script>
var isShown = bot.dom.typescript.isShown;
var elementIsShownInShadow;
var elementIsShown;
var elementIsShownDirectlyInShadow;
var elementIsShownInSlot;

var elementGetParent;
var elementGetParentSlot;

var elementGetText;
var elementGetTextShadow;
var elementGetTextSlot;
var elementGetTextSlots;

if (bot.dom.IS_SHADOW_DOM_ENABLED) {
elementIsShownInShadow =
document.querySelector('#is-shown-in-shadow');
elementIsShownInShadow.attachShadow({ mode: 'open' });
elementIsShownInShadow.shadowRoot.innerHTML =
'<div><div class="test">Foo</div></div>';

elementIsShownDirectlyInShadow =
document.querySelector('#is-shown-directly-in-shadow');
elementIsShownDirectlyInShadow.attachShadow({ mode: 'open' });
elementIsShownDirectlyInShadow.shadowRoot.innerHTML =
'<div>Foo</div>';

elementIsShown = document.querySelector('#is-shown');

elementIsShownInSlot =
document.querySelector('#is-shown-in-slot');
elementIsShownInSlot.attachShadow({ mode: 'open' });
elementIsShownInSlot.shadowRoot.innerHTML =
'<slot></slot>';

elementGetParent =
document.querySelector('#get-parent');

elementGetParentSlot =
document.querySelector('#get-parent-slot');
elementGetParentSlot.attachShadow({ mode: 'open' });
elementGetParentSlot.shadowRoot.innerHTML =
'<div><slot></slot></div>';

elementGetText =
document.querySelector('#get-text');

elementGetTextShadow =
document.querySelector('#get-text-shadow');
elementGetTextShadow.attachShadow({ mode: 'open' });
elementGetTextShadow.shadowRoot.innerHTML = 'foo';

elementGetTextSlot =
document.querySelector('#get-text-slot');
elementGetTextSlot.attachShadow({ mode: 'open' });
elementGetTextSlot.shadowRoot.innerHTML =
'<span>a</span><slot></slot><span>b</span>';

elementGetTextSlots =
document.querySelector('#get-text-slots');
elementGetTextSlots.attachShadow({ mode: 'open' });
elementGetTextSlots.shadowRoot.innerHTML =
'<slot name="a">Default</slot><slot name="b">Default</slot>';
}

QUnit.test('isShown', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

assert.ok(isShown(elementIsShown));

elementIsShown.style.display = 'none';

assert.notOk(isShown(elementIsShown));
});

QUnit.test('isShownInShadow', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

var el = elementIsShownInShadow
.shadowRoot
.querySelector('.test');

assert.ok(isShown(el));

elementIsShownInShadow.style.display = 'none';

assert.notOk(isShown(el));
});

QUnit.test('isShownDirectlyInShadow', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

var el = elementIsShownDirectlyInShadow
.shadowRoot
.querySelector('div');

assert.ok(isShown(el));

elementIsShownDirectlyInShadow.style.display = 'none';

assert.notOk(isShown(el));
});

QUnit.test('isShownInSlot', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

var el = elementIsShownInSlot.children[0];

assert.ok(isShown(el));

elementIsShownInSlot.style.display = 'none';

assert.notOk(isShown(el));

elementIsShownInSlot.style.display = '';
// Remove the slot, so our child is no longer slotted
elementIsShownInSlot.shadowRoot.innerHTML = '';

assert.notOk(isShown(el));
});

QUnit.test('getParentNodeInComposedDom', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

var el = elementGetParent.children[0];

assert.strictEqual(bot.dom.getParentNodeInComposedDom(el), elementGetParent);

el = elementGetParentSlot.children[0];

assert.strictEqual(
bot.dom.getParentNodeInComposedDom(el),
elementGetParentSlot.shadowRoot.querySelector('div')
);

elementGetParentSlot.shadowRoot.innerHTML = '';

assert.strictEqual(bot.dom.getParentNodeInComposedDom(el), null);
});

QUnit.test('getVisibleText', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

assert.strictEqual(bot.dom.getVisibleText(elementGetText), 'Foo');
});

QUnit.test('getVisibleTextInShadow', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

assert.strictEqual(bot.dom.getVisibleText(elementGetTextShadow), 'foo');
});

QUnit.test('getVisibleTextInSlot', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

assert.strictEqual(bot.dom.getVisibleText(elementGetTextSlot), 'aFoob');
});

QUnit.test('getVisibleTextInSlots', function(assert) {
if (!bot.dom.IS_SHADOW_DOM_ENABLED) {
assert.ok(true, 'Skipping: shadow DOM not enabled');
return;
}

assert.strictEqual(bot.dom.getVisibleText(elementGetTextSlots), 'Foo\nBar');
});
</script>
</body>
</html>
Loading
Loading