Skip to content

fix: example urls with icons #9368

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

Merged
LFDanLu merged 4 commits into from
Dec 18, 2025
+16 −7
Merged

fix: example urls with icons #9368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c67979f
fix: example urls with icons
snowystinger Dec 17, 2025
d002c4f
remove console logs
snowystinger Dec 17, 2025
740f448
use a lazy icon
snowystinger Dec 18, 2025
41cdd73
fix lint
snowystinger Dec 18, 2025
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
11 changes: 6 additions & 5 deletions packages/dev/s2-docs/src/IconPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {useGlobalListeners} from '@react-aria/utils';

const iconList = Object.keys(icons).map(name => ({id: name.replace(/^S2_Icon_(.*?)(Size\d+)?_2.*/, '$1'), icon: icons[name].default}));
const iconMap = Object.fromEntries(iconList.map(item => [item.id, item.icon]));
export const Icon = ({icon}) => createElement(iconMap[icon]);

const itemStyle = style({
...focusRing(),
Expand All @@ -33,7 +34,7 @@ const itemStyle = style({
justifyContent: 'center'
});

type IconValue = string | {text?: string, icon?: string | null, iconJSX?: ReactNode} | null;
type IconValue = string | {text?: string, icon?: string | null} | null;
interface IconPickerProps {
value: IconValue,
onChange: (value: IconValue) => void,
Expand Down Expand Up @@ -64,12 +65,12 @@ export function IconPicker({value, onChange, label, contextualHelp}: IconPickerP
return (
<Select
aria-label="Icon"
selectedKey={valueObject?.icon ?? null}
onSelectionChange={icon => {
value={valueObject?.icon ?? null}
onChange={icon => {
if (!icon || icon === valueObject?.icon) {
onChange({...valueObject, icon: null, iconJSX: null});
onChange({...valueObject, icon: null});
} else if (icon) {
onChange({...valueObject, icon: icon as string, iconJSX: createElement(iconMap[icon])});
onChange({...valueObject, icon: icon as string});
}
}}
className={style({display: 'flex', flexDirection: 'column', gap: 2, width: 'fit'})}>
Expand Down
12 changes: 10 additions & 2 deletions packages/dev/s2-docs/src/VisualExampleClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {TabLink} from './FileTabs';
import {useLocale} from 'react-aria';

export const IconPicker = lazy(() => import('./IconPicker').then(({IconPicker}) => ({default: IconPicker})));
let LazyIcon = lazy(() => import('./IconPicker').then(({Icon}) => ({default: Icon})));

type Props = {[name: string]: any};
type Controls = {[name: string]: PropControl};
Expand Down Expand Up @@ -132,10 +133,17 @@ export function Output({align = 'center', acceptOrientation}: {align?: 'center'

if (!isValidElement(component)) {
let children = props.children;
if (children?.iconJSX || children?.avatar || children?.badge) {
if (children?.icon || children?.avatar || children?.badge) {
let iconElement: ReactNode | null = null;
if (children.avatar) {
iconElement = <Avatar src="https://i.imgur.com/xIe7Wlb.png" />;
} else if (children.icon) {
iconElement = (<LazyIcon icon={children.icon} />);
}

children = (
<>
{children.avatar ? <Avatar src="https://i.imgur.com/xIe7Wlb.png" /> : children.iconJSX}
{iconElement}
{children.text && <Text>{children.text}</Text>}
{children.badge && <NotificationBadge value={12} />}
</>
Expand Down