Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
chg(tasks): do not clear props on create more, fix tag menu focus (#5303)
Seamus98c36df47c91
diff --git a/apps/web/src/features/block-md/component/ComposeTask.tsx b/apps/web/src/features/block-md/component/ComposeTask.tsxindex 6ca3dce0e0..dbbe14b5aa 100644--- a/apps/web/src/features/block-md/component/ComposeTask.tsx+++ b/apps/web/src/features/block-md/component/ComposeTask.tsx@@ -200,6 +200,7 @@ function ComposeTaskTitleEditor(props: {onTagSelected: (tag: TagMentionLifecycle) => void;onDeleteTagsAtStart: () => boolean;portalScope?: PortalScope;+ ref?: (el: HTMLDivElement) => void;}) {const [state, setState] = createSignal(props.value());const [showPlaceholder, setShowPlaceholder] = createSignal(@@ -307,6 +308,7 @@ function ComposeTaskTitleEditor(props: {contentEditable={!props.disabled()}class="ph-no-capture w-full text-xl font-medium outline-none whitespace-pre-wrap wrap-break-words"ref={(el) => {+ props.ref?.(el);onElementConnect(el, () => onConnect(el));}}/>@@ -527,6 +529,7 @@ export function ComposeTask(props: ComposeTaskProps) {const [isCreating, setIsCreating] = createSignal(false);const [tagLayoutMode, setTagLayoutMode] =createSignal<ComposerTagLayoutMode>('bottom');+ let titleEditorRoot: HTMLDivElement | undefined;let attachInputRef: HTMLInputElement | undefined;const handleAttachFiles = async (event: Event) => {@@ -752,6 +755,15 @@ export function ComposeTask(props: ComposeTaskProps) {setIsCreating(true);const properties = structuredClone(Object.entries(unwrap(propertyValues)));+ const resetTitleAndBody = () => {+ clearTaskComposerDraft();+ setTitle('');+ setContent('');+ setIsDraftLoaded(false);+ const ed = bodyEditor();+ ed && initializeEditorEmpty(ed);+ requestAnimationFrame(() => titleEditorRoot?.focus());+ };if (!createMore()) {// Snapshot the draft locally, then clear localStorage so a new dialog@@ -798,6 +810,9 @@ export function ComposeTask(props: ComposeTaskProps) {return;}+ resetTitleAndBody();+ setIsCreating(false);+const documentId = await createTaskWithProperties(taskTitle,taskContent,@@ -806,31 +821,16 @@ export function ComposeTask(props: ComposeTaskProps) {(params) => upsertToHistoryMutation.mutate(params));- setIsCreating(false);-if (!documentId) {return;}- // Success: clear draft and notify- clearTaskComposerDraft();if (props.onSuccess) {props.onSuccess({ documentId, title: taskTitle, content: taskContent });} else {showTaskCreatedToast(documentId);}props.onCreateTask?.(taskTitle, taskContent);-- if (createMore()) {- // Reset form for next task- setTitle('');- setContent('');- setPropertyValues(reconcile(getDefaultPropertyValues()));- setTagLayoutMode('bottom');- setIsDraftLoaded(false);- const ed = bodyEditor();- ed && initializeEditorEmpty(ed);- }};const handleContinueInSplit = async () => {@@ -1065,6 +1065,9 @@ export function ComposeTask(props: ComposeTaskProps) {}}onDeleteTagsAtStart={deleteTitleTagsAtStart}portalScope={portalScope()}+ ref={(el) => {+ titleEditorRoot = el;+ }}/></div>diff --git a/apps/web/src/features/property/tags/TagPicker.tsx b/apps/web/src/features/property/tags/TagPicker.tsxindex fe70d8d7a8..13e2aeee95 100644--- a/apps/web/src/features/property/tags/TagPicker.tsx+++ b/apps/web/src/features/property/tags/TagPicker.tsx@@ -81,10 +81,23 @@ export function TagPicker(props: TagPickerProps) {const [createSuccessHandler, setCreateSuccessHandler] =createSignal<CreateTagSuccessHandler>();let saveAndClose: (() => Promise<void>) | undefined;+ let triggerRef: HTMLButtonElement | undefined;- const setOpenState = (value: boolean) => {+ const restoreFocusToTrigger = () => {+ setTimeout(() => {+ triggerRef?.isConnected && triggerRef.focus();+ }, 0);+ };++ const setOpenState = (+ value: boolean,+ options?: { restoreFocus?: boolean }+ ) => {setOpen(value);props.onOpenChange?.(value);+ if (!value && options?.restoreFocus) {+ restoreFocusToTrigger();+ }};const handleOpenChange = (value: boolean) => {@@ -96,7 +109,7 @@ export function TagPicker(props: TagPickerProps) {if (saveAndClose) {void saveAndClose();} else {- setOpenState(false);+ setOpenState(false, { restoreFocus: true });}};@@ -109,6 +122,7 @@ export function TagPicker(props: TagPickerProps) {><Popover.Triggertype="button"+ ref={triggerRef}class={props.triggerClass}aria-label={props.triggerLabel}>@@ -120,7 +134,7 @@ export function TagPicker(props: TagPickerProps) {createDocTags={props.createDocTags}open={open}editorMode={editorMode}- onClose={() => setOpenState(false)}+ onClose={() => setOpenState(false, { restoreFocus: true })}onOpenCreateEditor={(mode, onCreateSuccess) => {setCreateSuccessHandler(() => onCreateSuccess);setEditorMode(mode);@@ -137,6 +151,7 @@ export function TagPicker(props: TagPickerProps) {onEditorClose={() => {setEditorMode(null);setCreateSuccessHandler(undefined);+ restoreFocusToTrigger();}}/></Show>@@ -433,6 +448,8 @@ function TagPickerBody(props: {createLabel().length > 0 && !exactTagMatchExists();const showClearAllRow = () =>selectedIds().size > 0 && !search().trim() && !createStep();+ const showCreateRowDivider = () =>+ showCreateRow() && (filteredItems().length > 0 || showClearAllRow());const itemIndex = (item: TagOptionItem) => filteredItems().indexOf(item);const clearAllRowIndex = () => filteredItems().length;const createRowIndex = () =>@@ -747,7 +764,12 @@ function TagPickerBody(props: {</Show></div><Show when={showCreateRow()}>- <div class="mt-1 border-t border-edge-muted pt-1">+ <div+ classList={{+ 'mt-1 border-t border-edge-muted pt-1':+ showCreateRowDivider(),+ }}+ ><CreateTagRowindex={createRowIndex()}label={createLabel()}