Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(web): show rename-modal chips from the live item preview (#6733)

dev-rbe0b010f3add2
diff --git a/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx b/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
index b9bc399b9a..7ddb87d272 100644
--- a/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
+++ b/apps/web/src/features/entity/bulk-edit/components/EntityActionSelection.tsx
@@ -1,10 +1,19 @@
import { EntityIcon, getEntityIconType } from '@core/component/EntityIcon';
+import { ItemPreview } from '@core/component/ItemPreview';
+import type { ItemEntity } from '@queries/preview';
import { Button, Tooltip } from '@ui';
import { createSignal, createUniqueId, For, Show } from 'solid-js';
import { EntitySelectionBadge } from '../../components/EntitySelectionBadge';
import { EntityTitle } from '../../extractors/entity-title';
import type { EntityData } from '../../types/entity';
+/** Preview identity for a selected row. Reminders are not storage items. */
+function previewEntity(entity: EntityData): ItemEntity | undefined {
+ if (entity.type === 'reminder') return undefined;
+ if (entity.type === 'channel') return { id: entity.id, type: 'channel' };
+ return { id: entity.id, type: entity.type };
+}
+
export function EntityActionSelection(props: {
entities: EntityData[];
disabled?: boolean;
@@ -16,7 +25,16 @@ export function EntityActionSelection(props: {
<div class="min-w-0">
<div class="flex min-w-0 items-center gap-1.5">
<For each={props.entities.slice(0, 2)}>
- {(entity) => <EntitySelectionBadge entity={entity} />}
+ {(entity) => (
+ <Show
+ when={previewEntity(entity)}
+ fallback={<EntitySelectionBadge entity={entity} />}
+ >
+ {(item) => (
+ <ItemPreview {...item()} class="min-w-0 max-w-48 shrink" />
+ )}
+ </Show>
+ )}
</For>
<Show when={props.entities.length > 2}>
<Button
diff --git a/apps/web/src/lib/core/component/ItemPreview.tsx b/apps/web/src/lib/core/component/ItemPreview.tsx
index 44e823b7a1..c01411209b 100644
--- a/apps/web/src/lib/core/component/ItemPreview.tsx
+++ b/apps/web/src/lib/core/component/ItemPreview.tsx
@@ -285,7 +285,11 @@ function ItemPreviewInner(props: ItemPreviewProps) {
props.disableHoverCard || isTouchDevice() || !blockName()
}
trigger={
- <button class={buttonClass()} {...navHandlers}>
+ <button
+ type="button"
+ class={buttonClass()}
+ {...navHandlers}
+ >
<div class={iconClass()}>
<ItemEntityIcon size={iconSize()} />
</div>