Skip to content

Core: Only show modified/affected icons on components and groups #34429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghengeveld wants to merge 2 commits into from
Closed

Core: Only show modified/affected icons on components and groups #34429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e4502
Only show modified and affected labels on components and groups, not …
ghengeveld Apr 1, 2026
4b9f32e
Update getDisplayStatus to include 'docs' item type for hidden story …
ghengeveld Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 44 additions & 26 deletions code/core/src/manager/components/sidebar/Tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import React, { useCallback, useMemo, useRef } from 'react';

import { Button, ListItem } from 'storybook/internal/components';
import { PRELOAD_ENTRIES } from 'storybook/internal/core-events';
import type { StatusValue } from 'storybook/internal/types';
import {
type API_HashEntry,
type StatusByTypeId,
type StatusesByStoryIdAndTypeId,
type StoryId,
import type {
API_HashEntry,
StatusByTypeId,
StatusesByStoryIdAndTypeId,
StatusValue,
StoryId,
} from 'storybook/internal/types';

import {
Expand Down Expand Up @@ -208,6 +208,19 @@ const statusOrder: StatusValue[] = [
'status-value:unknown',
];

const HIDDEN_STORY_STATUSES: ReadonlySet<StatusValue> = new Set([
'status-value:modified',
'status-value:affected',
]);

const getDisplayStatus = (
itemType: Item['type'],
status: StatusValue
): { status: StatusValue; label: string } =>
(itemType === 'story' || itemType === 'docs') && HIDDEN_STORY_STATUSES.has(status)
? { status: 'status-value:unknown', label: 'Unknown' }
: { status, label: status.split(':')[1].replace(/^./, (char) => char.toUpperCase()) };
Comment thread
ghengeveld marked this conversation as resolved.

const Node = React.memo<NodeProps>(function Node(props) {
const {
item,
Expand All @@ -228,10 +241,6 @@ const Node = React.memo<NodeProps>(function Node(props) {
const theme = useTheme();
const { isDesktop, isMobile, setMobileMenuOpen } = useLayout();

if (!isDisplayed) {
return null;
}

const statusLinks = useMemo<Link[]>(() => {
if (item.type === 'story' || item.type === 'docs') {
return Object.entries(statuses)
Expand All @@ -253,11 +262,16 @@ const Node = React.memo<NodeProps>(function Node(props) {
return [];
}, [item.id, item.type, onSelectStoryId, statuses]);

let contextMenu = useContextMenu(item, statusLinks, api);
if (refId !== 'storybook_internal') {
contextMenu = { node: null, onMouseEnter: () => {} };
}

if (!isDisplayed) {
return null;
}

const id = createId(item.id, refId);
const contextMenu =
refId === 'storybook_internal'
? useContextMenu(item, statusLinks, api)
: { node: null, onMouseEnter: () => {} };

if (
(item.type === 'story' &&
Expand All @@ -270,7 +284,8 @@ const Node = React.memo<NodeProps>(function Node(props) {
const statusValue = getMostCriticalStatusValue(
Object.values(statuses || {}).map((s) => s.value)
);
const { icon, textColor } = getStatus(theme, statusValue);
const { status, label } = getDisplayStatus(item.type, statusValue);
const { icon, textColor } = getStatus(theme, status);

return (
<LeafNodeStyleWrapper
Expand Down Expand Up @@ -311,10 +326,10 @@ const Node = React.memo<NodeProps>(function Node(props) {
{contextMenu.node}
{icon ? (
<StatusButton
ariaLabel={`Status: ${statusValue.replace('status-value:', '')}`}
ariaLabel={`Status: ${label}`}
data-testid="tree-status-button"
type="button"
status={statusValue}
status={status}
selectedItem={isSelected}
>
{icon}
Expand Down Expand Up @@ -369,14 +384,15 @@ const Node = React.memo<NodeProps>(function Node(props) {
}

const itemStatus = getMostCriticalStatusValue(Object.values(statuses || {}).map((s) => s.value));
const { icon: itemIcon, textColor: itemColor } = getStatus(theme, itemStatus);
const { status, label } = getDisplayStatus(item.type, itemStatus);
const { icon: itemIcon, textColor: itemColor } = getStatus(theme, status);
const itemStatusButton = itemIcon ? (
<StatusButton
ariaLabel={`Status: ${itemStatus.replace('status-value:', '')}`}
ariaLabel={`Status: ${label}`}
data-testid="tree-status-button"
role="status"
type="button"
status={itemStatus}
status={status}
selectedItem={isSelected}
>
{itemIcon}
Expand All @@ -393,7 +409,8 @@ const Node = React.memo<NodeProps>(function Node(props) {
item.type
];
const status = getMostCriticalStatusValue([itemStatus, groupStatus?.[item.id]]);
const color = status ? getStatus(theme, status).textColor : null;
const { status: displayedStatus, label } = getDisplayStatus(item.type, status);
const color = displayedStatus ? getStatus(theme, displayedStatus).textColor : null;
const showBranchStatus = (
[
'status-value:modified',
Expand All @@ -402,7 +419,7 @@ const Node = React.memo<NodeProps>(function Node(props) {
'status-value:warning',
'status-value:error',
] as StatusValue[]
).includes(status);
).includes(displayedStatus);

return (
<LeafNodeStyleWrapper
Expand Down Expand Up @@ -460,18 +477,19 @@ const Node = React.memo<NodeProps>(function Node(props) {
{contextMenu.node}
{showBranchStatus ? (
<StatusButton
ariaLabel={`Status: ${status.replace('status-value:', '')}`}
ariaLabel={`Status: ${label}`}
data-testid="tree-status-button"
type="button"
status={status}
status={displayedStatus}
selectedItem={isSelected}
>
{status === 'status-value:error' || status === 'status-value:warning' ? (
{displayedStatus === 'status-value:error' ||
displayedStatus === 'status-value:warning' ? (
<svg key="icon" viewBox="0 0 6 6" width="6" height="6" type="dot">
<UseSymbol type="dot" />
</svg>
) : (
getStatus(theme, status).icon
getStatus(theme, displayedStatus).icon
)}
</StatusButton>
) : (
Expand Down
Loading