Skip to content

Commit bd4c27d

Browse files
authored
Merge pull request #97 from SWangHash/rebase
fix the bug
2 parents b53b076 + 2da4d7a commit bd4c27d

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

‎src/web-ui/src/app/components/NavPanel/components/PersistentFooterActions.tsx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,6 @@ const PersistentFooterActions: React.FC = () => {
241241
<MessageCircle size={14} />
242242
<span>{t('header.feedback')}</span>
243243
</button>
244-
<button
245-
type="button"
246-
className="bitfun-nav-panel__footer-menu-item"
247-
role="menuitem"
248-
onClick={handleFeedback}
249-
>
250-
<MessageCircle size={14} />
251-
<span>{t('header.feedback')}</span>
252-
</button>
253244
<button
254245
type="button"
255246
className="bitfun-nav-panel__footer-menu-item"

‎src/web-ui/src/flow_chat/tool-cards/CompactToolCard.tsx‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export interface CompactToolCardProps {
4040
export const CompactToolCard: React.FC<CompactToolCardProps> = ({
4141
status,
4242
isExpanded = false,
43+
onClick,
4344
onMouseDown,
4445
onMouseUp,
4546
onMouseMove,
@@ -48,12 +49,16 @@ export const CompactToolCard: React.FC<CompactToolCardProps> = ({
4849
header,
4950
expandedContent,
5051
}) => {
51-
const handleWrapperClick = (event: React.MouseEvent) => {
52-
if (!onMouseUp || shouldIgnoreCardToggleClick(event)) {
52+
const handleClick = (event: React.MouseEvent) => {
53+
if (shouldIgnoreCardToggleClick(event)) {
5354
return;
5455
}
5556

56-
onMouseUp(event);
57+
if (onClick) {
58+
onClick(event);
59+
} else if (onMouseUp) {
60+
onMouseUp(event);
61+
}
5762
};
5863

5964
const loadingShimmer =
@@ -68,11 +73,11 @@ export const CompactToolCard: React.FC<CompactToolCardProps> = ({
6873
<BaseToolCard
6974
status={status}
7075
isExpanded
71-
onClick={handleWrapperClick}
76+
onClick={handleClick}
7277
className={`compact-tool-card-wrapper--expanded-card ${className}`.trim()}
7378
header={header}
7479
expandedContent={expandedContent}
75-
headerExpandAffordance={clickable || Boolean(onMouseUp)}
80+
headerExpandAffordance={clickable || Boolean(onClick) || Boolean(onMouseUp)}
7681
/>
7782
);
7883
}
@@ -85,7 +90,7 @@ export const CompactToolCard: React.FC<CompactToolCardProps> = ({
8590
className={`compact-tool-card status-${status} ${clickable ? 'clickable' : ''} ${isExpanded ? 'expanded' : ''}`}
8691
onMouseDown={onMouseDown}
8792
onMouseMove={onMouseMove}
88-
onMouseUp={handleWrapperClick}
93+
onMouseUp={handleClick}
8994
style={{ cursor: clickable ? 'pointer' : 'default' }}
9095
>
9196
{header}

0 commit comments

Comments
 (0)