From 7374f20653e37764c80e656db121bcd540b28d90 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Wed, 27 Nov 2024 18:38:20 +0100 Subject: [PATCH] fix: textarea props --- .../vbranches/upstreamIntegrationService.ts | 4 ++-- packages/ui/src/lib/Textarea.svelte | 20 ++----------------- .../src/stories/textarea/textareaDemo.svelte | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts b/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts index e17fbf2001..002d00a6fc 100644 --- a/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts +++ b/apps/desktop/src/lib/vbranches/upstreamIntegrationService.ts @@ -17,7 +17,7 @@ export type NameAndBranchStatus = { export type BranchStatus = | { - type: 'empty' | 'integrated' | 'safelyUpdatable'; + type: 'empty' | 'integrated' | 'saflyUpdatable'; } | { type: 'conflicted'; @@ -34,7 +34,7 @@ export function stackFullyIntegrated(stackStatus: StackStatus): boolean { } export type TreeStatus = { - type: 'empty' | 'conflicted' | 'safelyUpdatable'; + type: 'empty' | 'conflicted' | 'saflyUpdatable'; }; export type StackStatusInfo = { stack: VirtualBranch; status: StackStatus }; diff --git a/packages/ui/src/lib/Textarea.svelte b/packages/ui/src/lib/Textarea.svelte index 85925f5667..4d0995bd9e 100644 --- a/packages/ui/src/lib/Textarea.svelte +++ b/packages/ui/src/lib/Textarea.svelte @@ -1,18 +1,12 @@