From b8fd6370f88276c3d3789db3d25880feddc704bc Mon Sep 17 00:00:00 2001 From: donteatfriedrice Date: Wed, 2 Apr 2025 08:40:55 +0000 Subject: [PATCH] fix(editor): remove embed iframe toolbar edit item (#11396) --- .../components/embed-iframe-error-card.ts | 5 +- .../embed-iframe-link-input-popup.ts | 1 - .../embed-iframe-block/embed-iframe-block.ts | 5 +- .../extensions/editor-config/toolbar/index.ts | 46 ++----------------- 4 files changed, 6 insertions(+), 51 deletions(-) diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts index 0ec87fdd8..a74a0362a 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts @@ -197,10 +197,7 @@ export class EmbedIframeErrorCard extends WithDisposable(LitElement) { .std=${this.std} .inSurface=${this.inSurface} >`, - portalStyles: { - zIndex: 'var(--affine-z-index-popover)', - }, - container: this.host, + container: document.body, computePosition: { referenceElement: this._editButton, placement: 'bottom-start', diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-popup.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-popup.ts index 61be4ea13..0115fcd58 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-popup.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-popup.ts @@ -41,7 +41,6 @@ export class EmbedIframeLinkInputPopup extends EmbedIframeLinkInputBase { border-radius: 8px; background: ${unsafeCSSVarV2('layer/background/overlayPanel')}; box-shadow: ${unsafeCSSVar('overlayPanelShadow')}; - z-index: var(--affine-z-index-modal); font-family: ${unsafeCSS(baseTheme.fontSansFamily)}; } diff --git a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts index 6c82df5e9..91e408b4b 100644 --- a/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts +++ b/blocksuite/affine/blocks/block-embed/src/embed-iframe-block/embed-iframe-block.ts @@ -228,10 +228,7 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent`, - portalStyles: { - zIndex: 'var(--affine-z-index-popover)', - }, - container: this.host, + container: document.body, computePosition: { referenceElement: this._blockContainer, placement: 'bottom', diff --git a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts index 1634fb0de..c5eec6bc4 100644 --- a/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts +++ b/packages/frontend/core/src/blocksuite/extensions/editor-config/toolbar/index.ts @@ -971,11 +971,11 @@ const embedIframeToolbarConfig = { }, actions: [ { - id: 'a.copy-link-and-edit', + id: 'b.copy-link', actions: [ { id: 'copy-link', - tooltip: 'Copy link', + tooltip: 'Copy original link', icon: CopyIcon(), run(ctx) { const model = ctx.getCurrentBlockByType( @@ -989,52 +989,14 @@ const embedIframeToolbarConfig = { toast(ctx.host, 'Copied link to clipboard'); ctx.track('CopiedLink', { - category: matchModels(model, [BookmarkBlockModel]) - ? 'bookmark' + category: matchModels(model, [EmbedIframeBlockModel]) + ? 'embed iframe block' : 'link', type: 'card view', control: 'copy link', }); }, }, - { - id: 'edit', - tooltip: 'Edit', - icon: EditIcon(), - run(ctx) { - const component = ctx.getCurrentBlockByType( - EmbedIframeBlockComponent - ); - if (!component) return; - - ctx.hide(); - - const model = component.model; - const abortController = new AbortController(); - abortController.signal.onabort = () => ctx.show(); - - toggleEmbedCardEditModal( - ctx.host, - model, - 'card', - undefined, - undefined, - (_std, _component, props) => { - ctx.store.updateBlock(model, props); - component.requestUpdate(); - }, - abortController - ); - - ctx.track('OpenedAliasPopup', { - category: matchModels(model, [BookmarkBlockModel]) - ? 'bookmark' - : 'link', - type: 'card view', - control: 'edit', - }); - }, - }, ], }, ],