From 1dfb241eee6ce028cc4e515c7de601a0d0d1acd6 Mon Sep 17 00:00:00 2001 From: lawvs <18554747+lawvs@users.noreply.github.com> Date: Thu, 28 Jul 2022 15:46:55 +0800 Subject: [PATCH] fix: hide groupBy tag at kanban --- .../pendant-render/PandentRender.tsx | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/libs/components/editor-core/src/block-pendant/pendant-render/PandentRender.tsx b/libs/components/editor-core/src/block-pendant/pendant-render/PandentRender.tsx index ea45524f86..a9e89f4fad 100644 --- a/libs/components/editor-core/src/block-pendant/pendant-render/PandentRender.tsx +++ b/libs/components/editor-core/src/block-pendant/pendant-render/PandentRender.tsx @@ -1,15 +1,20 @@ -import React, { useRef, useState } from 'react'; -import { AsyncBlock } from '../../editor'; -import { getRecastItemValue, useRecastBlockMeta } from '../../recast-block'; import { MuiZoom, Popover, PopperHandler, styled, } from '@toeverything/components/ui'; -import { PendantTag } from '../PendantTag'; -import { UpdatePendantPanel } from '../pendant-operation-panel'; +import { useRef, useState } from 'react'; +import { AsyncBlock } from '../../editor'; +import { + getRecastItemValue, + RecastScene, + useCurrentView, + useRecastBlockMeta, +} from '../../recast-block'; import { AddPendantPopover } from '../AddPendantPopover'; +import { UpdatePendantPanel } from '../pendant-operation-panel'; +import { PendantTag } from '../PendantTag'; export const PendantRender = ({ block }: { block: AsyncBlock }) => { const popoverHandlerRef = useRef<{ [key: string]: PopperHandler }>({}); @@ -17,7 +22,8 @@ export const PendantRender = ({ block }: { block: AsyncBlock }) => { const [showAddBtn, setShowAddBtn] = useState(false); const { getProperties } = useRecastBlockMeta(); - + const [currentView] = useCurrentView(); + const isKanbanView = currentView.type === RecastScene.Kanban; const { getValue, removeValue } = getRecastItemValue(block); const properties = getProperties(); @@ -41,6 +47,11 @@ export const PendantRender = ({ block }: { block: AsyncBlock }) => { return null; } + // Hide the groupBy pendant at kanban view + if (isKanbanView && currentView.groupBy === property.id) { + return null; + } + const { id } = value; return (