Skip to content

fix: update commonmark to handle extensions #5

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
merged 2 commits into from
Oct 2, 2021
Merged

fix: update commonmark to handle extensions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28c9ab1
Update commonmark to handle extensions
alfonsobries Oct 1, 2021
af31bff
Attributes should be a string
alfonsobries Oct 1, 2021
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
2 changes: 1 addition & 1 deletion src/CommonMark/Extensions/Image/ContainerRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
final class ContainerRenderer
{
/** @phpstan-ignore-next-line */
public static function render($content, $title): HtmlElement
public static function render($content, $title): \Stringable|string|null
{
/* @phpstan-ignore-next-line */
if (empty($title)) {
Expand Down
4 changes: 2 additions & 2 deletions src/CommonMark/Extensions/Image/ImageRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class ImageRenderer implements NodeRendererInterface, XmlNodeRendererInter
*/
protected ConfigurationInterface $config;

public function render(Node $node, ChildNodeRendererInterface $childRenderer): \Stringable
public function render(Node $node, ChildNodeRendererInterface $childRenderer): \Stringable|string|null
{
Image::assertInstanceOf($node);

Expand All @@ -34,7 +34,7 @@ public function render(Node $node, ChildNodeRendererInterface $childRenderer): \
$attrs['src'] = $node->getUrl();
}

$alt = $node->renderNodes($node->children());
$alt = $childRenderer->renderNodes($node->children());
$alt = \preg_replace('/\<[^>]*alt="([^"]*)"[^>]*\>/', '$1', $alt);
$attrs['alt'] = \preg_replace('/\<[^>]*\>/', '', $alt);

Expand Down
16 changes: 8 additions & 8 deletions src/CommonMark/Extensions/Image/YouTubeRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ public static function render(MediaUrl $url): HtmlElement
{
$video = new HtmlElement('iframe', [
'width' => '100%',
'height' => 480,
'height' => '480',
'src' => 'https://www.youtube.com/embed/'.$url->getId(),
'frameborder' => 0,
'allowfullscreen' => 1,
'frameborder' => '0',
'allowfullscreen' => '1',
// Noise
'showinfo' => 0,
'controls' => 0,
'autoplay' => 0,
'modestbranding' => 1,
'autohide' => 1,
'showinfo' => '0',
'controls' => '0',
'autoplay' => '0',
'modestbranding' => '1',
'autohide' => '1',
]);

$container = new HtmlElement('div', ['class' => 'video-container']);
Expand Down
2 changes: 1 addition & 1 deletion src/CommonMark/Extensions/Link/LinkRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class LinkRenderer implements NodeRendererInterface, XmlNodeRendererInterf
*/
private ConfigurationInterface $config;

public function render(Node $node, ChildNodeRendererInterface $childRenderer): \Stringable
public function render(Node $node, ChildNodeRendererInterface $childRenderer): \Stringable|string|null
{
Link::assertInstanceOf($node);

Expand Down
16 changes: 14 additions & 2 deletions src/Providers/CommonMarkServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
use League\CommonMark\Extension\CommonMark\Renderer\Inline\EmphasisRenderer;
use League\CommonMark\Extension\CommonMark\Renderer\Inline\HtmlInlineRenderer;
use League\CommonMark\Extension\CommonMark\Renderer\Inline\StrongRenderer;
use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
use League\CommonMark\MarkdownConverterInterface;
use League\CommonMark\Node\Block\Document;
use League\CommonMark\Node\Block\Paragraph;
use League\CommonMark\Node\Inline\Newline;
Expand Down Expand Up @@ -137,7 +140,8 @@ private function registerViewFinder(): void
private function registerCommonMarkEnvironment(): void
{
/** @var \League\CommonMark\Environment\Environment */
$environment = $this->app->get('markdown.environment');
$environment = app(MarkdownConverterInterface::class)->getEnvironment();

$environment->addRenderer(FencedCode::class, new FencedCodeRenderer());

$environment->addBlockStartParser(new BlockQuoteStartParser(), 70);
Expand Down Expand Up @@ -193,6 +197,9 @@ private function registerCommonMarkEnvironment(): void
$environment->addRenderer($interface, resolve($implementation), 0);
}

$environment->addExtension(new ExternalLinkExtension());
$environment->addExtension(new HeadingPermalinkExtension());

$environment->mergeConfig([
'external_link' => [
'internal_hosts' => config('app.url'),
Expand All @@ -202,13 +209,18 @@ private function registerCommonMarkEnvironment(): void
'noopener' => 'external',
'noreferrer' => 'external',
],


'heading_permalink' => [
'html_class' => 'heading-permalink',
'id_prefix' => 'user-content',
'insert' => 'before',
'title' => 'Permalink',
'symbol' => '#',
'slug_normalizer' => new SlugNormalizer(),
],

'slug_normalizer' => [
'instance' => new SlugNormalizer(),
],
]);
}
Expand Down