diff --git a/src/components/rightSidePanel/parameters/TabNodes.vue b/src/components/rightSidePanel/parameters/TabNodes.vue index ab5deb1a9..1d59f5720 100644 --- a/src/components/rightSidePanel/parameters/TabNodes.vue +++ b/src/components/rightSidePanel/parameters/TabNodes.vue @@ -8,7 +8,7 @@ import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' -import { searchWidgetsAndNodes } from '../shared' +import { computedSectionDataList, searchWidgetsAndNodes } from '../shared' import type { NodeWidgetsListList } from '../shared' import SectionWidgets from './SectionWidgets.vue' @@ -24,18 +24,7 @@ const nodes = computed((): LGraphNode[] => { const rightSidePanelStore = useRightSidePanelStore() const { searchQuery } = storeToRefs(rightSidePanelStore) -const widgetsSectionDataList = computed((): NodeWidgetsListList => { - return nodes.value.map((node) => { - const { widgets = [] } = node - const shownWidgets = widgets - .filter((w) => !(w.options?.canvasOnly || w.options?.hidden)) - .map((widget) => ({ node, widget })) - return { - widgets: shownWidgets, - node - } - }) -}) +const { widgetsSectionDataList } = computedSectionDataList(nodes) const searchedWidgetsSectionDataList = shallowRef( widgetsSectionDataList.value diff --git a/src/components/rightSidePanel/parameters/TabNormalInputs.vue b/src/components/rightSidePanel/parameters/TabNormalInputs.vue index add128876..7f63a766a 100644 --- a/src/components/rightSidePanel/parameters/TabNormalInputs.vue +++ b/src/components/rightSidePanel/parameters/TabNormalInputs.vue @@ -7,7 +7,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' -import { searchWidgetsAndNodes } from '../shared' +import { computedSectionDataList, searchWidgetsAndNodes } from '../shared' import type { NodeWidgetsListList } from '../shared' import SectionWidgets from './SectionWidgets.vue' @@ -21,21 +21,14 @@ const { t } = useI18n() const rightSidePanelStore = useRightSidePanelStore() const { searchQuery } = storeToRefs(rightSidePanelStore) -const widgetsSectionDataList = computed((): NodeWidgetsListList => { - return nodes.map((node) => { - const { widgets = [] } = node - const shownWidgets = widgets - .filter( - (w) => - !(w.options?.canvasOnly || w.options?.hidden || w.options?.advanced) - ) - .map((widget) => ({ node, widget })) - - return { widgets: shownWidgets, node } - }) -}) +const { widgetsSectionDataList, includesAdvanced } = computedSectionDataList( + () => nodes +) const advancedWidgetsSectionDataList = computed((): NodeWidgetsListList => { + if (includesAdvanced.value) { + return [] + } return nodes .map((node) => { const { widgets = [] } = node diff --git a/src/components/rightSidePanel/settings/TabGlobalSettings.vue b/src/components/rightSidePanel/settings/TabGlobalSettings.vue index d283c2e41..86dd8c046 100644 --- a/src/components/rightSidePanel/settings/TabGlobalSettings.vue +++ b/src/components/rightSidePanel/settings/TabGlobalSettings.vue @@ -1,7 +1,7 @@