diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts index 35f87327af..27a0b508a8 100644 --- a/integration/__tests__/cluster-pages.tests.ts +++ b/integration/__tests__/cluster-pages.tests.ts @@ -410,7 +410,7 @@ describe("Lens cluster pages", () => { await app.client.waitForVisible(".LogSearch .SearchInput input"); // Search for semicolon await app.client.keys(":"); - await app.client.waitForVisible(".LogList .LogRow span.active"); + await app.client.waitForVisible(".LogList .list span.active"); // Click through controls await app.client.click(".LogControls .show-timestamps"); await app.client.click(".LogControls .show-previous"); diff --git a/src/renderer/components/dock/log-list.scss b/src/renderer/components/dock/log-list.scss index ab6bdc7ad3..edae55ad61 100644 --- a/src/renderer/components/dock/log-list.scss +++ b/src/renderer/components/dock/log-list.scss @@ -35,7 +35,7 @@ .VirtualList { height: 100%; - .listElement { + .list { overflow-x: scroll!important; .LogRow { diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx index 410fd85f83..9437a854e2 100644 --- a/src/renderer/components/dock/log-list.tsx +++ b/src/renderer/components/dock/log-list.tsx @@ -262,7 +262,6 @@ export class LogList extends React.Component { outerRef={this.virtualListDiv} ref={this.virtualListRef} className="box grow" - listClassName="listElement" /> {this.isJumpButtonVisible && ( diff --git a/src/renderer/components/virtual-list/virtual-list.module.css b/src/renderer/components/virtual-list/virtual-list.scss similarity index 88% rename from src/renderer/components/virtual-list/virtual-list.module.css rename to src/renderer/components/virtual-list/virtual-list.scss index d512d83eb9..3953be4756 100644 --- a/src/renderer/components/virtual-list/virtual-list.module.css +++ b/src/renderer/components/virtual-list/virtual-list.scss @@ -19,7 +19,9 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -.list { - /* Render scrollbar in content area, preventing to occupy extra space */ - overflow-y: overlay!important; -} \ No newline at end of file +.VirtualList { + > div > .list { + /* Render scrollbar in content area, preventing to occupy extra space */ + overflow-y: overlay!important; + } +} diff --git a/src/renderer/components/virtual-list/virtual-list.tsx b/src/renderer/components/virtual-list/virtual-list.tsx index c048328834..9d8f900b67 100644 --- a/src/renderer/components/virtual-list/virtual-list.tsx +++ b/src/renderer/components/virtual-list/virtual-list.tsx @@ -21,7 +21,7 @@ // Wrapper for "react-window" component // API docs: https://react-window.now.sh -import styles from "./virtual-list.module.css"; +import "./virtual-list.scss"; import React, { Component } from "react"; import { observer } from "mobx-react"; @@ -96,7 +96,7 @@ export class VirtualList extends Component { }; render() { - const { width, className, items, getRow, onScroll, outerRef, listClassName } = this.props; + const { width, className, items, getRow, onScroll, outerRef } = this.props; const { overscanCount } = this.state; const rowData: RowData = { items, @@ -108,7 +108,7 @@ export class VirtualList extends Component { {({ height }) => (