Skip to content

Commit 904e2a4

Browse files
committed
Merge remote-tracking branch 'origin/2.x' into 2.x
# Conflicts: # src/Filament/Forms/Components/MarkdownEditor.php
2 parents a04e3e7 + be3ab97 commit 904e2a4

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/Filament/Forms/Components/MarkdownEditor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ protected function mutateContentPickerState(Model | Content $content)
270270

271271
// Convert attributes array to string
272272
$attributesString = collect($attributes)
273-
->map(fn($value, $key) => "{$key}=\"{$value}\"")
273+
->map(fn ($value, $key) => "{$key}=\"{$value}\"")
274274
->join(' ');
275275

276276
return [

src/Filament/Forms/Components/RichEditor/Plugins/ContentPickerRichPlugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public function getEditorActions(): array
9797
],
9898
editorSelection: $arguments['editorSelection'],
9999
);
100+
100101
return;
101102
}
102103

@@ -107,7 +108,7 @@ public function getEditorActions(): array
107108
'target' => $data['shouldOpenInNewTab'] ? '_blank' : null,
108109
];
109110

110-
if (!$isSingleCharacterSelection && ($arguments['editorSelection']['type'] ?? '') === 'text') {
111+
if (! $isSingleCharacterSelection && ($arguments['editorSelection']['type'] ?? '') === 'text') {
111112
// Convert selected text to cmsContentLink
112113
$component->runCommands(
113114
[

0 commit comments

Comments
 (0)