Skip to content
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.

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

Aside: Support custom icons #2261

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions docs/src/content/docs/components/asides.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ Other content is also supported in asides.
</Aside>

<Aside type="danger">Do not give your password to anyone.</Aside>

<Aside icon="heart">
Aside with a custom icon. The icon must be part of starlight's icon list.
</Aside>
````

<Fragment slot="markdoc">
Expand All @@ -73,6 +77,10 @@ Other content is also supported in asides.
{% aside type="danger" %}
Do not give your password to anyone.
{% /aside %}

{% aside icon="heart" %}
Aside with a custom icon. The icon must be part of starlight's icon list.
{% /aside %}
````

</Fragment>
Expand All @@ -95,6 +103,10 @@ Do not give your password to anyone.

<Aside type="danger">Do not give your password to anyone.</Aside>

<Aside icon="heart">
Aside with a custom icon. The icon must be part of starlight's icon list.
</Aside>

</Fragment>

</Preview>
Expand Down
14 changes: 14 additions & 0 deletions docs/src/content/docs/guides/authoring-content.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,20 @@ Astro helps you build faster websites with [“Islands Architecture”](https://
:::
```

### Custom aside icons

You can specify a custom icon for the aside in curly brackets following the aside type/title, e.g. `:::tip[Did you know?]{icon="heart"}`.

:::tip[Did you know?]{icon="heart"}
Astro helps you build faster websites with [“Islands Architecture”](https://docs.astro.build/en/concepts/islands/).
:::

```md
:::tip[Did you know?]{icon="heart"}
Astro helps you build faster websites with [“Islands Architecture”](https://docs.astro.build/en/concepts/islands/).
:::
```

### More aside types

Caution and danger asides are helpful for drawing a user’s attention to details that may trip them up.
Expand Down
23 changes: 23 additions & 0 deletions packages/starlight/__tests__/remark-rehype/asides.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,29 @@ Some text
);
});

describe('custom icons', () => {
test.each(['note', 'tip', 'caution', 'danger'])('%s with custom label', async (type) => {
const res = await processor.render(`
:::${type}{icon="heart"}
Some text
:::
`);
expect(res.code).includes(
'M20.16 5A6.29 6.29 0 0 0 12 4.36a6.27 6.27 0 0 0-8.16 9.48l6.21 6.22a2.78 2.78 0 0 0 3.9 0l6.21-6.22a6.27 6.27 0 0 0 0-8.84m-1.41 7.46-6.21 6.21a.76.76 0 0 1-1.08 0l-6.21-6.24a4.29 4.29 0 0 1 0-6 4.27 4.27 0 0 1 6 0 1 1 0 0 0 1.42 0 4.27 4.27 0 0 1 6 0 4.29 4.29 0 0 1 .08 6Z'
);

expect(async () =>
processor.render(`
:::${type}{icon="invalid-icon-name"}
Some text
:::
`)
).rejects.toThrowError(
'Failed to parse Markdown file "undefined":\nIcon name should be part of Starlight\'s icon list.'
);
});
});

test('ignores unknown directive variants', async () => {
const res = await processor.render(`
:::unknown
Expand Down
20 changes: 19 additions & 1 deletion packages/starlight/integrations/asides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import { visit } from 'unist-util-visit';
import type { StarlightConfig } from '../types';
import type { createTranslationSystemFromFs } from '../utils/translations-fs';
import { pathToLocale } from './shared/pathToLocale';
import { Icons } from '../components/Icons';
import { fromHtml } from 'hast-util-from-html';
import type { Element } from 'hast';
import { AstroError } from 'astro/errors';

interface AsidesOptions {
starlightConfig: { locales: StarlightConfig['locales'] };
Expand Down Expand Up @@ -160,6 +164,7 @@ function remarkAsides(options: AsidesOptions): Plugin<[], Root> {
return;
}
const variant = node.name;
const attributes = node.attributes;
if (!isAsideVariant(variant)) return;

// remark-directive converts a container’s “label” to a paragraph added as the head of its
Expand All @@ -181,6 +186,19 @@ function remarkAsides(options: AsidesOptions): Plugin<[], Root> {
node.children.splice(0, 1);
}

let iconPath = iconPaths[variant];
if (attributes) {
if (attributes['icon']) {
const iconName = attributes['icon'] as keyof typeof Icons;
if (!Object.keys(Icons).includes(iconName)) {
throw new AstroError("Icon name should be part of Starlight's icon list.");
}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've put a placeholder error for now, please feel free to suggest another error message that might follow starlight's guidelines.

const { properties } = fromHtml(Icons[iconName], { fragment: true })
.children[0] as Element;
iconPath = [s('path', properties)];
}
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels a bit ugly-ish to me, any pointers to improve this would be welcome!

const aside = h(
'aside',
{
Expand All @@ -198,7 +216,7 @@ function remarkAsides(options: AsidesOptions): Plugin<[], Root> {
fill: 'currentColor',
class: 'starlight-aside__icon',
},
iconPaths[variant]
iconPath
),
...titleNode,
]),
Expand Down
4 changes: 2 additions & 2 deletions packages/starlight/user-components/Aside.astro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface Props {
title?: string;
}

let { type = 'note', title } = Astro.props;
let { type = 'note', title, icon } = Astro.props;

if (!asideVariants.includes(type)) {
throw new AstroError(
Expand All @@ -30,7 +30,7 @@ if (!title) {

<aside aria-label={title} class={`starlight-aside starlight-aside--${type}`}>
<p class="starlight-aside__title" aria-hidden="true">
<Icon name={icons[type]} class="starlight-aside__icon" />{title}
<Icon name={icon || icons[type]} class="starlight-aside__icon" />{title}
</p>
<section class="starlight-aside__content">
<slot />
Expand Down
Loading