diff --git a/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts b/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts index 9f285a2450..a6467a129e 100644 --- a/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts +++ b/src/panels/config/integrations/integration-panels/bluetooth/bluetooth-network-visualization.ts @@ -17,7 +17,8 @@ import type { NetworkLink, NetworkNode, } from "../../../../../components/chart/ha-network-graph"; -import "../../../../../components/search-input-outlined"; +import "../../../../../components/input/ha-input-search"; +import type { HaInputSearch } from "../../../../../components/input/ha-input-search"; import type { BluetoothDeviceData, BluetoothScannersDetails, @@ -130,13 +131,7 @@ export class BluetoothNetworkVisualization extends LitElement { back-path="/config/bluetooth/dashboard" > ${this.narrow - ? html`
- -
` + ? html`
${this._renderInputSearch()}
` : nothing} - ${!this.narrow - ? html`` - : nothing} + ${!this.narrow ? this._renderInputSearch("search") : nothing} `; } + private _renderInputSearch(slot = "") { + return html``; + } + private _getSearchableAttributes = (nodeId: string): string[] => { const attributes: string[] = []; const device = this._sourceDevices[nodeId]; @@ -175,8 +172,8 @@ export class BluetoothNetworkVisualization extends LitElement { return attributes; }; - private _handleSearchChange(ev: CustomEvent): void { - this._searchFilter = ev.detail.value; + private _handleSearchChange(ev: InputEvent): void { + this._searchFilter = (ev.target as HaInputSearch).value ?? ""; } private _getRssiColorVar = memoizeOne((rssi: number): string => { @@ -394,7 +391,7 @@ export class BluetoothNetworkVisualization extends LitElement { display: flex; align-items: center; } - search-input-outlined { + ha-input-search { flex: 1; } `, diff --git a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts index abd68a798c..fb15cbc59b 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts @@ -10,7 +10,8 @@ import { getDeviceContext } from "../../../../../common/entity/context/get_devic import { navigate } from "../../../../../common/navigate"; import "../../../../../components/chart/ha-network-graph"; import type { NetworkData } from "../../../../../components/chart/ha-network-graph"; -import "../../../../../components/search-input-outlined"; +import "../../../../../components/input/ha-input-search"; +import type { HaInputSearch } from "../../../../../components/input/ha-input-search"; import type { DeviceRegistryEntry } from "../../../../../data/device/device_registry"; import type { ZHADevice } from "../../../../../data/zha"; import { fetchDevices, refreshTopology } from "../../../../../data/zha"; @@ -59,13 +60,7 @@ export class ZHANetworkVisualizationPage extends LitElement { )} > ${this.narrow - ? html`
- -
` + ? html`
${this._renderInputSearch()}
` : nothing} - ${!this.narrow - ? html`` - : nothing} + ${!this.narrow ? this._renderInputSearch("search") : nothing} `; + } + private async _fetchData() { this._devices = await fetchDevices(this.hass!); this._networkData = createZHANetworkChartData( @@ -130,8 +127,8 @@ export class ZHANetworkVisualizationPage extends LitElement { return attributes; }; - private _handleSearchChange(ev: CustomEvent): void { - this._searchFilter = ev.detail.value; + private _handleSearchChange(ev: InputEvent): void { + this._searchFilter = (ev.target as HaInputSearch).value ?? ""; } private _tooltipFormatter = (params: TopLevelFormatterParams): string => { @@ -208,7 +205,7 @@ export class ZHANetworkVisualizationPage extends LitElement { display: flex; align-items: center; } - search-input-outlined { + ha-input-search { flex: 1; } `, diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts index 56018b79fb..2930760357 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-network-visualization.ts @@ -14,7 +14,7 @@ import type { NetworkLink, NetworkNode, } from "../../../../../components/chart/ha-network-graph"; -import "../../../../../components/search-input-outlined"; +import "../../../../../components/input/ha-input-search"; import type { DeviceRegistryEntry } from "../../../../../data/device/device_registry"; import type { ZWaveJSNodeStatisticsUpdatedMessage, @@ -28,6 +28,7 @@ import { import "../../../../../layouts/hass-subpage"; import { SubscribeMixin } from "../../../../../mixins/subscribe-mixin"; import type { HomeAssistant, Route } from "../../../../../types"; +import type { HaInputSearch } from "../../../../../components/input/ha-input-search"; @customElement("zwave_js-network-visualization") export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) { @@ -84,13 +85,7 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) { .configEntryId}" > ${this.narrow - ? html`
- -
` + ? html`
${this._renderInputSearch()}
` : nothing} - ${!this.narrow - ? html`` - : nothing} + ${!this.narrow ? this._renderInputSearch("search") : nothing} `; } + private _renderInputSearch(slot = "") { + return html``; + } + private async _fetchNetworkStatus() { const network = await fetchZwaveNetworkStatus(this.hass!, { entry_id: this.configEntryId, @@ -149,8 +146,8 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) { return attributes; }; - private _handleSearchChange(ev: CustomEvent): void { - this._searchFilter = ev.detail.value; + private _handleSearchChange(ev: InputEvent): void { + this._searchFilter = (ev.target as HaInputSearch).value ?? ""; } private _tooltipFormatter = (params: TopLevelFormatterParams): string => { @@ -382,7 +379,7 @@ export class ZWaveJSNetworkVisualization extends SubscribeMixin(LitElement) { display: flex; align-items: center; } - search-input-outlined { + ha-input-search { flex: 1; } `,