Skip to content

flow: page auto focus regression fix + e2e test #1352

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

Merged
MykolaGolubyev merged 3 commits into from
Sep 15, 2025
Merged

flow: page auto focus regression fix + e2e test #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b01436b
add e2e test
MykolaGolubyev Sep 14, 2025
cc8f4e9
fix test
MykolaGolubyev Sep 14, 2025
06848ce
fix test
MykolaGolubyev Sep 15, 2025
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<commonmark.version>0.23.0</commonmark.version>
<antlr.version>4.5</antlr.version>
<jackson.version>2.19.1</jackson.version>
<webtau.version>2.2</webtau.version>
<webtau.version>2.4</webtau.version>
<jaxb.version>2.3.0</jaxb.version>
<ant.version>1.10.11</ant.version>
<ant-compress.version>1.5</ant-compress.version>
Expand Down
1 change: 1 addition & 0 deletions znai-docs/znai/release-notes/1.80/fix-2025-09-13-focus-page-content-on-load.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fix: Focus page content on page open or search open regression
8 changes: 7 additions & 1 deletion znai-reactjs/src/layout/DocumentationLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import React, { useRef, useState } from "react";
import React, { useEffect, useRef, useState } from "react";

import TocPanel from "./TocPanel";
import { PageGenError } from "../doc-elements/page-gen-error/PageGenError";
Expand Down Expand Up @@ -95,6 +95,12 @@ export function DocumentationLayout({

const panelFullClassName = mainPanelClassName + (isMobile ? " mobile" : "");

useEffect(() => {
if (contentRef.current) {
contentRef.current.focus();
}
}, [selectedTocItem]);

return isMobile ? renderMobile() : renderDesktop();

function renderPageContent() {
Expand Down
7 changes: 7 additions & 0 deletions znai-tests/src/test/groovy/scenarios/docsContent.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ scenario('table of contents navigation') {
browser.title.should == "Your Product: Page Three"
}

scenario('main content should have focus on page load and after navigation') {
browser.open(scaffoldServerUrl.get() + '/my-product/chapter-one/getting-started')
standardView.pageTitle.waitTo == "Getting Started"
browser.sendKeys(browser.keys.pageDown)
standardView.mainPanelScrollTop.waitToBe > 100
}

scenario('navigating back and forth should preserve scroll position') {
standardView.gettingStartedTocItem.click()
standardView.metaSection.waitTo visible
Expand Down