From 554659bd9156ac07e64322f90aebb4a93691d126 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 7 Mar 2023 11:43:42 +0000 Subject: [PATCH] Fix buttons being highlighted when filters are set --- .../DataTable/buttons/sheet/SheetCreateColumnButton.svelte | 4 ++-- .../DataTable/buttons/sheet/SheetCreateRowButton.svelte | 4 ++-- .../backend/DataTable/buttons/sheet/SheetFilterButton.svelte | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateColumnButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateColumnButton.svelte index 4b04fbbbbc..5d0bd5140a 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateColumnButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateColumnButton.svelte @@ -2,11 +2,11 @@ import CreateColumnButton from "../CreateColumnButton.svelte" import { getContext, onMount } from "svelte" - const { rows, columns, subscribe } = getContext("sheet") + const { rows, columns, subscribe, filter } = getContext("sheet") let createColumnModal - $: highlighted = !$rows.length || !$columns.length + $: highlighted = !$filter.length && (!$rows.length || !$columns.length) onMount(() => subscribe("add-column", createColumnModal.show)) diff --git a/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateRowButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateRowButton.svelte index f91f7a7b76..d2903b9526 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateRowButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/sheet/SheetCreateRowButton.svelte @@ -3,10 +3,10 @@ import CreateEditRow from "../../modals/CreateEditRow.svelte" import { getContext } from "svelte" - const { rows, columns } = getContext("sheet") + const { rows, columns, filter } = getContext("sheet") $: hasCols = !!$columns.length - $: hasRows = !!$rows.length + $: hasRows = $rows.length || $filter.length { - filter.set(e.detail) + filter.set(e.detail || []) }