From 67de5b6811ff50418b8d4a7edaae473736d5f24f Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Thu, 2 Oct 2025 16:42:06 +0700
Subject: [PATCH 1/4] Support card drafts

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 .../src/components/NewCardForm.svelte         | 43 +++++++++++++++--
 plugins/card-resources/src/draft.ts           | 47 +++++++++++++++++++
 2 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 plugins/card-resources/src/draft.ts

diff --git a/plugins/card-resources/src/components/NewCardForm.svelte b/plugins/card-resources/src/components/NewCardForm.svelte
index 9cc1b893f11..f49df8cbdea 100644
--- a/plugins/card-resources/src/components/NewCardForm.svelte
+++ b/plugins/card-resources/src/components/NewCardForm.svelte
@@ -13,7 +13,13 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { getClient, getCommunicationClient, SpaceSelector } from '@hcengineering/presentation'
+  import {
+    getClient,
+    getCommunicationClient,
+    SpaceSelector,
+    DraftController,
+    draftsStore
+  } from '@hcengineering/presentation'
   import { ModernButton, ModernEditbox, ButtonIcon, IconSend, IconMinimize } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
 
@@ -24,6 +30,7 @@
   import { getResource } from '@hcengineering/platform'
   import { EmptyMarkup, markupToText, isEmptyMarkup, markupToJSON } from '@hcengineering/text'
   import { createCard } from '../utils'
+  import { getCardDraftKey, getEmptyCardDraft, type CardDraft } from '../draft'
   import { AttachmentStyledBox } from '@hcengineering/attachment-resources'
   import { AttachIcon } from '@hcengineering/text-editor-resources'
   import { AttachmentID, BlobParams } from '@hcengineering/communication-types'
@@ -31,9 +38,9 @@
   import textEditor, { type RefAction } from '@hcengineering/text-editor'
   import { defaultMessageInputActions } from '@hcengineering/communication-resources'
   import chat from '@hcengineering/chat'
+  import { Analytics } from '@hcengineering/analytics'
 
   import EditorActions from './EditorActions.svelte'
-  import { Analytics } from '@hcengineering/analytics'
 
   const dispatch = createEventDispatcher()
   const communicationClient = getCommunicationClient()
@@ -43,12 +50,39 @@
   export let type: Ref<MasterTag> = threadMasterTag
   export let space: Ref<CardSpace> | undefined = undefined
 
-  let title: string = ''
-  let description = EmptyMarkup
+  // Initialize DraftController with stable location-specific key
+  const draftKey = getCardDraftKey()
+  const draftController = new DraftController<CardDraft>(draftKey)
+  $: currentDraft = $draftsStore[draftKey] as CardDraft | undefined
+
   let _id = generateId<Card>()
   let isExpanded = false
   let descriptionBox: AttachmentStyledBox
 
+  // Initialize form state from draft or defaults
+  let title: string = ''
+  let description: Markup = EmptyMarkup
+  let initialized = false
+
+  // Initialize form fields once when draft is available
+  $: if (currentDraft != null && !initialized) {
+    title = currentDraft.title
+    description = currentDraft.description
+    if (currentDraft.type !== undefined) {
+      type = currentDraft.type
+    }
+    if (currentDraft.space !== undefined) {
+      space = currentDraft.space
+    }
+    if (currentDraft.title !== '' || !isEmptyMarkup(currentDraft.description)) {
+      isExpanded = true
+    }
+    initialized = true
+  }
+
+  // Save draft when form state changes
+  $: draftController.save({ title, description, type, space }, getEmptyCardDraft())
+
   let creating = false
   $: applyDisabled = (title.trim() === '' && isEmptyMarkup(description)) || space == null || type == null || creating
 
@@ -137,6 +171,7 @@
     title = ''
     description = EmptyMarkup
     _id = generateId<Card>()
+    draftController.remove()
   }
 
   function expand (): void {
diff --git a/plugins/card-resources/src/draft.ts b/plugins/card-resources/src/draft.ts
new file mode 100644
index 00000000000..00b542646cf
--- /dev/null
+++ b/plugins/card-resources/src/draft.ts
@@ -0,0 +1,47 @@
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { type Ref, type Markup } from '@hcengineering/core'
+import { type CardSpace, type MasterTag } from '@hcengineering/card'
+import { EmptyMarkup } from '@hcengineering/text'
+import { getCurrentLocation, type Location } from '@hcengineering/ui'
+
+/**
+ * Card draft interface for DraftController
+ */
+export interface CardDraft {
+  title: string
+  description: Markup
+  type: Ref<MasterTag> | undefined
+  space: Ref<CardSpace> | undefined
+}
+
+/**
+ * Generate a location-specific draft key for card drafts
+ */
+export function getCardDraftKey (location?: Location): string {
+  const currentLocation = location ?? getCurrentLocation()
+  const locationKey = currentLocation.path.slice(2).join('.') ?? 'root'
+  const fragmentKey =
+    currentLocation.fragment != null && currentLocation.fragment !== '' ? `.${currentLocation.fragment}` : ''
+  return `card_draft.${locationKey}${fragmentKey}`
+}
+
+export function getEmptyCardDraft (): CardDraft {
+  return {
+    title: '',
+    description: EmptyMarkup,
+    type: undefined,
+    space: undefined
+  }
+}

From 39d6ffb460706ed35a85ac2b3951b39a8e51d566 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Thu, 2 Oct 2025 17:07:55 +0700
Subject: [PATCH 2/4] Clean up

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 plugins/card-resources/src/components/NewCardForm.svelte | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/card-resources/src/components/NewCardForm.svelte b/plugins/card-resources/src/components/NewCardForm.svelte
index f49df8cbdea..397c70a7a38 100644
--- a/plugins/card-resources/src/components/NewCardForm.svelte
+++ b/plugins/card-resources/src/components/NewCardForm.svelte
@@ -50,7 +50,6 @@
   export let type: Ref<MasterTag> = threadMasterTag
   export let space: Ref<CardSpace> | undefined = undefined
 
-  // Initialize DraftController with stable location-specific key
   const draftKey = getCardDraftKey()
   const draftController = new DraftController<CardDraft>(draftKey)
   $: currentDraft = $draftsStore[draftKey] as CardDraft | undefined
@@ -64,7 +63,6 @@
   let description: Markup = EmptyMarkup
   let initialized = false
 
-  // Initialize form fields once when draft is available
   $: if (currentDraft != null && !initialized) {
     title = currentDraft.title
     description = currentDraft.description
@@ -80,7 +78,6 @@
     initialized = true
   }
 
-  // Save draft when form state changes
   $: draftController.save({ title, description, type, space }, getEmptyCardDraft())
 
   let creating = false

From 35f69f71b07151f103cd77354939d70a2c85d870 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Thu, 2 Oct 2025 18:14:04 +0700
Subject: [PATCH 3/4] Update init logic

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Artyom Savchenko <armisav@gmail.com>
---
 .../src/components/NewCardForm.svelte         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/card-resources/src/components/NewCardForm.svelte b/plugins/card-resources/src/components/NewCardForm.svelte
index 397c70a7a38..7d92d21b873 100644
--- a/plugins/card-resources/src/components/NewCardForm.svelte
+++ b/plugins/card-resources/src/components/NewCardForm.svelte
@@ -63,21 +63,24 @@
   let description: Markup = EmptyMarkup
   let initialized = false
 
-  $: if (currentDraft != null && !initialized) {
-    title = currentDraft.title
-    description = currentDraft.description
-    if (currentDraft.type !== undefined) {
-      type = currentDraft.type
+  function initializeFromDraft(draft: CardDraft) {
+    title = draft.title
+    description = draft.description
+    if (draft.type !== undefined) {
+      type = draft.type
     }
-    if (currentDraft.space !== undefined) {
-      space = currentDraft.space
+    if (draft.space !== undefined) {
+      space = draft.space
     }
-    if (currentDraft.title !== '' || !isEmptyMarkup(currentDraft.description)) {
+    if (draft.title !== '' || !isEmptyMarkup(draft.description)) {
       isExpanded = true
     }
     initialized = true
   }
 
+  $: if (currentDraft != null && !initialized) {
+    initializeFromDraft(currentDraft)
+  }
   $: draftController.save({ title, description, type, space }, getEmptyCardDraft())
 
   let creating = false

From e719d03f88d7dd0ef3b871e35988717415ed8740 Mon Sep 17 00:00:00 2001
From: Artem Savchenko <armisav@gmail.com>
Date: Thu, 2 Oct 2025 18:17:56 +0700
Subject: [PATCH 4/4] Fix formatting

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 plugins/card-resources/src/components/NewCardForm.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/card-resources/src/components/NewCardForm.svelte b/plugins/card-resources/src/components/NewCardForm.svelte
index 7d92d21b873..03c1c998c79 100644
--- a/plugins/card-resources/src/components/NewCardForm.svelte
+++ b/plugins/card-resources/src/components/NewCardForm.svelte
@@ -63,7 +63,7 @@
   let description: Markup = EmptyMarkup
   let initialized = false
 
-  function initializeFromDraft(draft: CardDraft) {
+  function initializeFromDraft (draft: CardDraft): void {
     title = draft.title
     description = draft.description
     if (draft.type !== undefined) {